diff --git a/modules/net/dap_chain_net.c b/modules/net/dap_chain_net.c
index dd5e9d982d28be088d6fb50fb7ee560c2db37f0e..657d45aea1cd10624c270d1c2aaf8cc902c3556b 100644
--- a/modules/net/dap_chain_net.c
+++ b/modules/net/dap_chain_net.c
@@ -1559,20 +1559,13 @@ void dap_chain_net_delete( dap_chain_net_t * a_net )
  * @brief
  * load network config settings
  */
-<<<<<<< HEAD
 void dap_chain_net_load_all()
 {
     int l_ret = 0;
-=======
-void dap_chain_net_load_all() {
-    int32_t l_ret = 0;
->>>>>>> 6470e33bbac26f6f7ebaf48bd84da3f6fee5f4fe
-
     if(!HASH_COUNT(s_net_items)){
         log_it(L_ERROR, "Can't find any nets");
         return;
-    }
-    pthread_rwlock_rdlock(&s_net_items_rwlock);
+    }    pthread_rwlock_rdlock(&s_net_items_rwlock);
     dap_chain_net_item_t *l_net_items_current = NULL, *l_net_items_tmp = NULL;
     HASH_ITER(hh, s_net_items, l_net_items_current, l_net_items_tmp) {
         if( (l_ret = s_net_load(l_net_items_current->chain_net)) ) {
diff --git a/modules/service/xchange/dap_chain_net_srv_xchange.c b/modules/service/xchange/dap_chain_net_srv_xchange.c
index b293315120a3bfe07b7c886a56e02f1de3864b46..da7fee4e21266314799a66b200520e3b0488d9f2 100644
--- a/modules/service/xchange/dap_chain_net_srv_xchange.c
+++ b/modules/service/xchange/dap_chain_net_srv_xchange.c
@@ -128,7 +128,11 @@ int dap_chain_net_srv_xchange_init()
     dap_chain_net_srv_t* l_srv = dap_chain_net_srv_add(l_uid, "srv_xchange", &l_srv_callbacks);
     s_srv_xchange = DAP_NEW_Z(dap_chain_net_srv_xchange_t);
     if (!s_srv_xchange || !l_srv) {
+<<<<<<< HEAD
         log_it(L_ERROR, "Memory allocation error in %s, line %d", __PRETTY_FUNCTION__, __LINE__);
+=======
+        log_it(L_ERROR, "Memory allocation error in dap_chain_net_srv_xchange_init");
+>>>>>>> 7de6eea216cf5a3febe704020575257a90d006d3
         return -1;
     }
     l_srv->_internal = s_srv_xchange;
diff --git a/modules/type/blocks/dap_chain_cs_blocks.c b/modules/type/blocks/dap_chain_cs_blocks.c
index ce284dcacc474dd9057d52596f44eab7bbb11a4d..17a0f46877b91846d214d3da94e7a596fea4f900 100644
--- a/modules/type/blocks/dap_chain_cs_blocks.c
+++ b/modules/type/blocks/dap_chain_cs_blocks.c
@@ -1666,3 +1666,16 @@ static dap_list_t *s_callback_get_atoms(dap_chain_t *a_chain, size_t a_count, si
     }
     return l_list;
 }
+
+int dap_chain_cs_block_get_ret_code_ledger(dap_chain_t *a_chain, dap_hash_fast_t *a_datum_hash){
+    dap_chain_cs_blocks_t *l_blocks = DAP_CHAIN_CS_BLOCKS(a_chain);
+    dap_chain_cs_blocks_pvt_t *l_blocks_pvt = PVT(l_blocks);
+    dap_chain_block_datum_index_t *l_datum_index = NULL;
+    pthread_rwlock_rdlock(&l_blocks_pvt->datums_rwlock);
+    HASH_FIND(hh, l_blocks_pvt->datum_index, a_datum_hash, sizeof (*a_datum_hash), l_datum_index);
+    pthread_rwlock_unlock(&l_blocks_pvt->datums_rwlock);
+    if (l_datum_index) {
+        return  l_datum_index->ret_code;
+    }
+    return -1;
+}
diff --git a/modules/type/blocks/include/dap_chain_cs_blocks.h b/modules/type/blocks/include/dap_chain_cs_blocks.h
index 4e1cf5494e0e1dc5d23a39bbd55b79853362a7a7..79402d5ecff115484fd136640d653b1092a2417b 100644
--- a/modules/type/blocks/include/dap_chain_cs_blocks.h
+++ b/modules/type/blocks/include/dap_chain_cs_blocks.h
@@ -70,3 +70,4 @@ void dap_chain_cs_blocks_deinit();
 int dap_chain_cs_blocks_new(dap_chain_t * a_chain, dap_config_t * a_chain_config);
 void dap_chain_cs_blocks_delete(dap_chain_t * a_chain);
 dap_chain_block_cache_t * dap_chain_block_cs_cache_get_by_hash(dap_chain_cs_blocks_t * a_blocks,  dap_chain_hash_fast_t *a_block_hash);
+int dap_chain_cs_block_get_ret_code_ledger(dap_chain_t *a_chain, dap_hash_fast_t *a_datum_hash);
\ No newline at end of file