MinOS Build Error 2

frameworks/base/core/res/res/values/config.xml:2355: error: Found text "
>>>>>>> 7e9570d... SignalStrength: Allow for custom signal buckets in LTE
" where item tag is expected

make: *** [/media/lubuntu/771f4ca9-7e28-4aa2-b64c-75dcef416815/minos/out/target/common/obj/APPS/framework-res_intermediates/package-export.apk] Error 1
make: *** Deleting file `/media/lubuntu/771f4ca9-7e28-4aa2-b64c-75dcef416815/minos/out/target/common/obj/APPS/framework-res_intermediates/package-export.apk'
make: *** Waiting for unfinished jobs....

#### make failed to build some targets (49:15 (mm:ss)) ####