diff --git a/.jenkins_linux_builds b/.jenkins_linux_builds
index 2cdad66e..0d7abc97 100644
--- a/.jenkins_linux_builds
+++ b/.jenkins_linux_builds
@@ -68,10 +68,7 @@ pipeline {
       agent {
         dockerfile {
           filename 'mingw64'
-<<<<<<< HEAD
-=======
           additionalBuildArgs '--build-arg NUM_JOBS=8'
->>>>>>> 6ecad9af72106de84ac2984785f3838d7391ffca
           dir 'docker/64_bit'
         }
       }