diff --git a/src/rpc/tungstenite_client/client.rs b/src/rpc/tungstenite_client/client.rs
index 830afaac2..c9a007fb6 100644
--- a/src/rpc/tungstenite_client/client.rs
+++ b/src/rpc/tungstenite_client/client.rs
@@ -147,17 +147,8 @@ pub fn do_reconnect(error: &RpcClientError) -> bool {
 	)
 }
 
-<<<<<<< HEAD
-fn send_message_to_client(
-	result_in: ThreadOut<String>,
-	message: &str,
-	subscription_id: &str,
-) -> Result<()> {
-	trace!("got on_subscription_msg {}", message);
-=======
 fn send_message_to_client(result_in: ThreadOut<String>, message: &str) -> Result<()> {
 	debug!("got on_subscription_msg {}", message);
->>>>>>> parent of be3e1f7... Add subscription ID recognition to tungstenite and ws-rpc client (#662)
 	let value: Value = serde_json::from_str(message)?;
 
 	match value["id"].as_str() {
diff --git a/src/rpc/ws_client/mod.rs b/src/rpc/ws_client/mod.rs
index 9ff81b9d2..7bcc676f0 100644
--- a/src/rpc/ws_client/mod.rs
+++ b/src/rpc/ws_client/mod.rs
@@ -112,13 +112,8 @@ impl HandleMessage for SubscriptionHandler {
 		let out = &context.out;
 		let msg = &context.msg;
 
-<<<<<<< HEAD
-		trace!("got on_subscription_msg {}", msg);
-		let value: serde_json::Value = serde_json::from_str(msg).map_err(Box::new)?;
-=======
 		info!("got on_subscription_msg {}", msg);
 		let value: serde_json::Value = serde_json::from_str(msg.as_text()?).map_err(Box::new)?;
->>>>>>> parent of be3e1f7... Add subscription ID recognition to tungstenite and ws-rpc client (#662)
 
 		match value["id"].as_str() {
 			Some(_idstr) => {