diff --git a/libraries/chain/include/eos/chain/message_handling_contexts.hpp b/libraries/chain/include/eos/chain/message_handling_contexts.hpp
index 4b53216a93f..dd38d31208f 100644
--- a/libraries/chain/include/eos/chain/message_handling_contexts.hpp
+++ b/libraries/chain/include/eos/chain/message_handling_contexts.hpp
@@ -28,7 +28,6 @@ class apply_context {
 
    int32_t load_i64( Name scope, Name code, Name table, Name Key, char* data, uint32_t maxlen );
 
-<<<<<<< HEAD
    int32_t front_primary_i128i128( Name scope, Name code, Name table,
                                    uint128_t* primary, uint128_t* secondary, char* data, uint32_t maxlen );
    int32_t back_primary_i128i128( Name scope, Name code, Name table,