diff --git a/modules/consensus/esbocs/dap_chain_cs_esbocs.c b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
index 51d851773210ddf1f690d0eb5f997e18fab836fa..c92bb2350436cb131f5ebf2ee1f858145eabc53c 100644
--- a/modules/consensus/esbocs/dap_chain_cs_esbocs.c
+++ b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
@@ -2732,11 +2732,7 @@ static void s_message_send(dap_chain_esbocs_session_t *a_session, uint8_t a_mess
             l_args->message_size = l_message_size + l_sign_size;
             memcpy(l_args->message, l_message, l_message_size + l_sign_size);
             dap_proc_thread_callback_add(a_session->proc_thread, s_process_incoming_message, l_args);
-<<<<<<< HEAD
         }
-=======
-\        }
->>>>>>> 1ba3c33fc3c96dd1deb6614419b50d8dc026126b
     }
     DAP_DELETE(l_message);
 }