From 04e1d5c1e588d3ab1b766384c628a6b35859c7fa Mon Sep 17 00:00:00 2001
From: Kinrezc <matt.czernik@gmail.com>
Date: Wed, 11 Oct 2023 11:52:54 -0400
Subject: [PATCH] fix conflicts

---
 Cargo.lock | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 411e0985b..1ee6a4bf6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -171,8 +171,8 @@ dependencies = [
 
 [[package]]
 name = "arbiter-core"
-version = "0.6.0"
-source = "git+https://github.com/primitivefinance/arbiter.git?branch=arbiter/version#3c908aed7b2d66d703e5101a41dbf63b23900846"
+version = "0.6.1"
+source = "git+https://github.com/primitivefinance/arbiter.git?branch=main#9907eaaf81be03d36fb1447bea5692b8745fa916"
 dependencies = [
  "RustQuant",
  "async-trait",
@@ -198,7 +198,7 @@ dependencies = [
 [[package]]
 name = "arbiter-derive"
 version = "0.1.0"
-source = "git+https://github.com/primitivefinance/arbiter.git?branch=arbiter/version#3c908aed7b2d66d703e5101a41dbf63b23900846"
+source = "git+https://github.com/primitivefinance/arbiter.git?branch=main#9907eaaf81be03d36fb1447bea5692b8745fa916"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5025,11 +5025,10 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.8+zstd.1.5.5"
+version = "2.0.9+zstd.1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c"
+checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656"
 dependencies = [
  "cc",
- "libc",
  "pkg-config",
 ]