diff --git a/ci/travis/graviton2/install.sh b/ci/travis/graviton2/install.sh
index 5334eefde964..811ce8a9e2f0 100755
--- a/ci/travis/graviton2/install.sh
+++ b/ci/travis/graviton2/install.sh
@@ -27,7 +27,11 @@ sudo sh -c "apt-get remove -y libproj-dev"
 export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 
 # Configure GDAL
+<<<<<<< HEAD:ci/travis/graviton2/install.sh
 sh -c "cd $PWD && ./autogen.sh && CCACHE_CPP2=yes CC='ccache gcc' CXX='ccache g++' LDFLAGS='-lstdc++' ./configure --prefix=/usr --without-libtool --with-jpeg12 --with-python=/usr/bin/python3 --with-poppler --with-mysql --with-liblzma --without-webp --with-epsilon --with-proj=/usr/local --with-poppler --with-hdf5 --with-sosi --with-mysql --with-libtiff=internal --with-rename-internal-libtiff-symbols"
+=======
+sh -c "cd $PWD/gdal && CCACHE_CPP2=yes CC='ccache gcc' CXX='ccache g++' LDFLAGS='-lstdc++' ./configure --prefix=/usr --without-libtool --with-jpeg12 --with-python=/usr/bin/python3 --with-poppler --with-mysql --with-liblzma --without-webp --with-epsilon --with-proj=/usr/local --with-poppler --with-hdf5 --with-dods-root=/usr --with-sosi --with-mysql --with-libtiff=internal --with-rename-internal-libtiff-symbols"
+>>>>>>> 66a76c0d6d (Merge branch 'master' of github.com:OSGeo/gdal):gdal/ci/travis/graviton2/install.sh
 
 sh -c "cd $PWD && CCACHE_CPP2=yes make USER_DEFS=-Werror -j3"
 sh -c "cd $PWD/apps && make USER_DEFS=-Werror -j3 test_ogrsf"
diff --git a/ci/travis/s390x/install.sh b/ci/travis/s390x/install.sh
index 5334eefde964..a76579212d2f 100755
--- a/ci/travis/s390x/install.sh
+++ b/ci/travis/s390x/install.sh
@@ -27,7 +27,11 @@ sudo sh -c "apt-get remove -y libproj-dev"
 export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 
 # Configure GDAL
+<<<<<<< HEAD:ci/travis/s390x/install.sh
 sh -c "cd $PWD && ./autogen.sh && CCACHE_CPP2=yes CC='ccache gcc' CXX='ccache g++' LDFLAGS='-lstdc++' ./configure --prefix=/usr --without-libtool --with-jpeg12 --with-python=/usr/bin/python3 --with-poppler --with-mysql --with-liblzma --without-webp --with-epsilon --with-proj=/usr/local --with-poppler --with-hdf5 --with-sosi --with-mysql --with-libtiff=internal --with-rename-internal-libtiff-symbols"
+=======
+sh -c "cd $PWD/gdal && CCACHE_CPP2=yes CC='ccache gcc' CXX='ccache g++' LDFLAGS='-lstdc++' ./configure --prefix=/usr --without-libtool --with-jpeg12 --with-python=/usr/bin/python3 --with-poppler --with-mysql --with-liblzma --without-webp --with-epsilon --with-proj=/usr/local --with-poppler --with-hdf5 --with-dods-root=/usr --with-sosi --with-mysql --with-libtiff=internal --with-rename-internal-libtiff-symbols"
+>>>>>>> 66a76c0d6d (Merge branch 'master' of github.com:OSGeo/gdal):gdal/ci/travis/s390x/install.sh
 
 sh -c "cd $PWD && CCACHE_CPP2=yes make USER_DEFS=-Werror -j3"
 sh -c "cd $PWD/apps && make USER_DEFS=-Werror -j3 test_ogrsf"
diff --git a/ogr/ogrsf_frmts/dxf/ogrdxfreader.cpp b/ogr/ogrsf_frmts/dxf/ogrdxfreader.cpp
index 463a57764128..7d04a0f16936 100644
--- a/ogr/ogrsf_frmts/dxf/ogrdxfreader.cpp
+++ b/ogr/ogrsf_frmts/dxf/ogrdxfreader.cpp
@@ -219,10 +219,14 @@ int OGRDXFReader::ReadValueRaw( char *pszValueBuf, int nValueBufSize )
 <<<<<<< HEAD:ogr/ogrsf_frmts/dxf/ogrdxfreader.cpp
 =======
 
-        // If nothing was read, we have reached the end of the file
+        // If nothing was read, we have prematurely reached the end of the file
         if( iEOL == iSrcBufferOffset )
+<<<<<<< HEAD:ogr/ogrsf_frmts/dxf/ogrdxfreader.cpp
             break;
 >>>>>>> 137c8e8f4e (Merge branch 'master' of github.com:OSGeo/gdal):gdal/ogr/ogrsf_frmts/dxf/ogrdxfreader.cpp
+=======
+            return -1;
+>>>>>>> 66a76c0d6d (Merge branch 'master' of github.com:OSGeo/gdal):gdal/ogr/ogrsf_frmts/dxf/ogrdxfreader.cpp
     }
 
     size_t nValueBufLen = 0;