diff --git a/src/CryptoNoteConfig.h b/src/CryptoNoteConfig.h
index be463a60aa..fdff2121c1 100644
--- a/src/CryptoNoteConfig.h
+++ b/src/CryptoNoteConfig.h
@@ -74,7 +74,6 @@ const char     MINER_CONFIG_FILE_NAME[]                      = "miner_conf.json"
 
 //TODO Put here the name of your currency
 const char     CRYPTONOTE_NAME[]                             = "dacyanus";
-<<<<<<< HEAD
 const char     GENESIS_COINBASE_TX_HEX[]                     = "013c01ff0001ec85afd1b101029b2e4c0281c0b02e7c53291a94d1d0cbff8883f8024f5142ee494ffbbd0880712101289090d39c764ee12e2c4a17eed260491da97c76da27df5fab3a3238ebc764d2";
 
 const uint8_t  CURRENT_TRANSACTION_VERSION                   =  1;