diff --git a/Cargo.toml b/Cargo.toml
index 8343d9ed64..48ad3018f4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,10 +1,6 @@
 [package]
 name = "grin"
-<<<<<<< HEAD
 version = "2.0.1-beta.1"
-=======
-version = "1.1.1-beta.1"
->>>>>>> set version number to next (possible) 1.1.x version
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
 license = "Apache-2.0"
@@ -36,7 +32,6 @@ term = "0.5"
 failure = "0.1"
 failure_derive = "0.1"
 
-<<<<<<< HEAD
 grin_api = { path = "./api", version = "2.0.1-beta.1" }
 grin_config = { path = "./config", version = "2.0.1-beta.1" }
 grin_core = { path = "./core", version = "2.0.1-beta.1" }
@@ -44,15 +39,6 @@ grin_keychain = { path = "./keychain", version = "2.0.1-beta.1" }
 grin_p2p = { path = "./p2p", version = "2.0.1-beta.1" }
 grin_servers = { path = "./servers", version = "2.0.1-beta.1" }
 grin_util = { path = "./util", version = "2.0.1-beta.1" }
-=======
-grin_api = { path = "./api", version = "1.1.1-beta.1" }
-grin_config = { path = "./config", version = "1.1.1-beta.1" }
-grin_core = { path = "./core", version = "1.1.1-beta.1" }
-grin_keychain = { path = "./keychain", version = "1.1.1-beta.1" }
-grin_p2p = { path = "./p2p", version = "1.1.1-beta.1" }
-grin_servers = { path = "./servers", version = "1.1.1-beta.1" }
-grin_util = { path = "./util", version = "1.1.1-beta.1" }
->>>>>>> set version number to next (possible) 1.1.x version
 
 [target.'cfg(windows)'.dependencies]
 cursive = { version = "0.12", default-features = false, features = ["pancurses-backend"] }
@@ -66,10 +52,5 @@ cursive = "0.12"
 built = "0.3"
 
 [dev-dependencies]
-<<<<<<< HEAD
 grin_chain = { path = "./chain", version = "2.0.1-beta.1" }
 grin_store = { path = "./store", version = "2.0.1-beta.1" }
-=======
-grin_chain = { path = "./chain", version = "1.1.1-beta.1" }
-grin_store = { path = "./store", version = "1.1.1-beta.1" }
->>>>>>> set version number to next (possible) 1.1.x version
diff --git a/api/Cargo.toml b/api/Cargo.toml
index bec5cba5da..1ae4a063bd 100644
--- a/api/Cargo.toml
+++ b/api/Cargo.toml
@@ -30,18 +30,9 @@ futures = "0.1.21"
 rustls = "0.13"
 url = "1.7.0"
 
-<<<<<<< HEAD
 grin_core = { path = "../core", version = "2.0.1-beta.1" }
 grin_chain = { path = "../chain", version = "2.0.1-beta.1" }
 grin_p2p = { path = "../p2p", version = "2.0.1-beta.1" }
 grin_pool = { path = "../pool", version = "2.0.1-beta.1" }
 grin_store = { path = "../store", version = "2.0.1-beta.1" }
 grin_util = { path = "../util", version = "2.0.1-beta.1" }
-=======
-grin_core = { path = "../core", version = "1.1.1-beta.1" }
-grin_chain = { path = "../chain", version = "1.1.1-beta.1" }
-grin_p2p = { path = "../p2p", version = "1.1.1-beta.1" }
-grin_pool = { path = "../pool", version = "1.1.1-beta.1" }
-grin_store = { path = "../store", version = "1.1.1-beta.1" }
-grin_util = { path = "../util", version = "1.1.1-beta.1" }
->>>>>>> set version number to next (possible) 1.1.x version
diff --git a/chain/Cargo.toml b/chain/Cargo.toml
index f39b17f227..d3e81b2a47 100644
--- a/chain/Cargo.toml
+++ b/chain/Cargo.toml
@@ -23,17 +23,10 @@ lru-cache = "0.1"
 lazy_static = "1"
 regex = "1"
 
-<<<<<<< HEAD
 grin_core = { path = "../core", version = "2.0.1-beta.1" }
 grin_keychain = { path = "../keychain", version = "2.0.1-beta.1" }
 grin_store = { path = "../store", version = "2.0.1-beta.1" }
 grin_util = { path = "../util", version = "2.0.1-beta.1" }
-=======
-grin_core = { path = "../core", version = "1.1.1-beta.1" }
-grin_keychain = { path = "../keychain", version = "1.1.1-beta.1" }
-grin_store = { path = "../store", version = "1.1.1-beta.1" }
-grin_util = { path = "../util", version = "1.1.1-beta.1" }
->>>>>>> set version number to next (possible) 1.1.x version
 
 [dev-dependencies]
 env_logger = "0.5"
diff --git a/config/Cargo.toml b/config/Cargo.toml
index eed38d14c6..3829f5661a 100644
--- a/config/Cargo.toml
+++ b/config/Cargo.toml
@@ -16,17 +16,10 @@ serde_derive = "1"
 toml = "0.4"
 dirs = "1.0.3"
 
-<<<<<<< HEAD
 grin_core = { path = "../core", version = "2.0.1-beta.1" }
 grin_servers = { path = "../servers", version = "2.0.1-beta.1" }
 grin_p2p = { path = "../p2p", version = "2.0.1-beta.1" }
 grin_util = { path = "../util", version = "2.0.1-beta.1" }
-=======
-grin_core = { path = "../core", version = "1.1.1-beta.1" }
-grin_servers = { path = "../servers", version = "1.1.1-beta.1" }
-grin_p2p = { path = "../p2p", version = "1.1.1-beta.1" }
-grin_util = { path = "../util", version = "1.1.1-beta.1" }
->>>>>>> set version number to next (possible) 1.1.x version
 
 [dev-dependencies]
 pretty_assertions = "0.5.1"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 4edba22f6d..6c5ce86b9f 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -29,13 +29,8 @@ log = "0.4"
 chrono = { version = "0.4.4", features = ["serde"] }
 zeroize = "0.9"
 
-<<<<<<< HEAD
 grin_keychain = { path = "../keychain", version = "2.0.1-beta.1" }
 grin_util = { path = "../util", version = "2.0.1-beta.1" }
-=======
-grin_keychain = { path = "../keychain", version = "1.1.1-beta.1" }
-grin_util = { path = "../util", version = "1.1.1-beta.1" }
->>>>>>> set version number to next (possible) 1.1.x version
 
 [dev-dependencies]
 serde_json = "1"
diff --git a/keychain/Cargo.toml b/keychain/Cargo.toml
index ccaacb6d99..6eb462520d 100644
--- a/keychain/Cargo.toml
+++ b/keychain/Cargo.toml
@@ -27,8 +27,4 @@ ripemd160 = "0.7"
 sha2 = "0.7"
 pbkdf2 = "0.2"
 
-<<<<<<< HEAD
 grin_util = { path = "../util", version = "2.0.1-beta.1" }
-=======
-grin_util = { path = "../util", version = "1.1.1-beta.1" }
->>>>>>> set version number to next (possible) 1.1.x version
diff --git a/p2p/Cargo.toml b/p2p/Cargo.toml
index e507a6c768..219d36f4c0 100644
--- a/p2p/Cargo.toml
+++ b/p2p/Cargo.toml
@@ -22,7 +22,6 @@ tempfile = "3.0.5"
 log = "0.4"
 chrono = { version = "0.4.4", features = ["serde"] }
 
-<<<<<<< HEAD
 grin_core = { path = "../core", version = "2.0.1-beta.1" }
 grin_store = { path = "../store", version = "2.0.1-beta.1" }
 grin_util = { path = "../util", version = "2.0.1-beta.1" }
@@ -30,12 +29,3 @@ grin_chain = { path = "../chain", version = "2.0.1-beta.1" }
 
 [dev-dependencies]
 grin_pool = { path = "../pool", version = "2.0.1-beta.1" }
-=======
-grin_core = { path = "../core", version = "1.1.1-beta.1" }
-grin_store = { path = "../store", version = "1.1.1-beta.1" }
-grin_util = { path = "../util", version = "1.1.1-beta.1" }
-grin_chain = { path = "../chain", version = "1.1.1-beta.1" }
-
-[dev-dependencies]
-grin_pool = { path = "../pool", version = "1.1.1-beta.1" }
->>>>>>> set version number to next (possible) 1.1.x version
diff --git a/p2p/src/protocol.rs b/p2p/src/protocol.rs
index cfe5a910e9..2f557b9016 100644
--- a/p2p/src/protocol.rs
+++ b/p2p/src/protocol.rs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-
 use crate::conn::{Message, MessageHandler, Response, Tracker};
 use crate::core::core::{self, hash::Hash, hash::Hashed, CompactBlock};
 
@@ -317,13 +316,13 @@ impl MessageHandler for Protocol {
 
 			Type::TxHashSetRequest => {
 				let sm_req: TxHashSetRequest = msg.body()?;
-				debug!(
-					"handle_payload: txhashset req for {} at {}",
-					sm_req.hash, sm_req.height
-				);
 
 				let txhashset_header = self.adapter.txhashset_archive_header()?;
 				let txhashset_header_hash = txhashset_header.hash();
+				debug!(
+					"handle_payload: txhashset request for {} at {}, response with {} at {}",
+					sm_req.hash, sm_req.height, txhashset_header.height, txhashset_header_hash,
+				);
 				let txhashset = self.adapter.txhashset_read(txhashset_header_hash);
 
 				if let Some(txhashset) = txhashset {
diff --git a/pool/Cargo.toml b/pool/Cargo.toml
index 02b3ab4ddc..53cd7a7a6a 100644
--- a/pool/Cargo.toml
+++ b/pool/Cargo.toml
@@ -19,7 +19,6 @@ chrono = "0.4.4"
 failure = "0.1"
 failure_derive = "0.1"
 
-<<<<<<< HEAD
 grin_core = { path = "../core", version = "2.0.1-beta.1" }
 grin_keychain = { path = "../keychain", version = "2.0.1-beta.1" }
 grin_store = { path = "../store", version = "2.0.1-beta.1" }
@@ -27,12 +26,3 @@ grin_util = { path = "../util", version = "2.0.1-beta.1" }
 
 [dev-dependencies]
 grin_chain = { path = "../chain", version = "2.0.1-beta.1" }
-=======
-grin_core = { path = "../core", version = "1.1.1-beta.1" }
-grin_keychain = { path = "../keychain", version = "1.1.1-beta.1" }
-grin_store = { path = "../store", version = "1.1.1-beta.1" }
-grin_util = { path = "../util", version = "1.1.1-beta.1" }
-
-[dev-dependencies]
-grin_chain = { path = "../chain", version = "1.1.1-beta.1" }
->>>>>>> set version number to next (possible) 1.1.x version
diff --git a/store/Cargo.toml b/store/Cargo.toml
index 9803e17564..e3c21a10ee 100644
--- a/store/Cargo.toml
+++ b/store/Cargo.toml
@@ -23,13 +23,8 @@ serde = "1"
 serde_derive = "1"
 log = "0.4"
 
-<<<<<<< HEAD
 grin_core = { path = "../core", version = "2.0.1-beta.1" }
 grin_util = { path = "../util", version = "2.0.1-beta.1" }
-=======
-grin_core = { path = "../core", version = "1.1.1-beta.1" }
-grin_util = { path = "../util", version = "1.1.1-beta.1" }
->>>>>>> set version number to next (possible) 1.1.x version
 
 [dev-dependencies]
 chrono = "0.4.4"