message: Remove conflict marker that snuck past
diff: @@ -28,7 +28,6 @@ public:
  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,
  