diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
index baba0b2b51..5254a44eb4 100644
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -61,7 +61,6 @@ set_config('HAVE_YASM', have_yasm)
 # Until the YASM variable is not necessary in old-configure.
 add_old_configure_assignment('YASM', have_yasm)
 
-<<<<<<< HEAD
 # Android NDK
 # ==============================================================
 
@@ -70,7 +69,6 @@ def compiling_android(compile_env, build_project, gonkdir, _):
     return compile_env and (gonkdir or build_project in ('mobile/android', 'js'))
 
 include('android-ndk.configure', when=compiling_android)
-=======
 # nasm detection
 # ==============================================================
 nasm = check_prog('NASM', ['nasm'], allow_missing=True)
@@ -108,7 +106,6 @@ def nasm_asflags(have_nasm, target):
         return asflags
 
 set_config('NASM_ASFLAGS', nasm_asflags)
->>>>>>> 2d3d34f993 (Enable dav1d SIMD on more architectures)
 
 # MacOS deployment target version
 # ==============================================================