diff --git a/ci/appveyor/build_script.bat b/ci/appveyor/build_script.bat
index d0d3f61b34..5ae47df5ec 100644
--- a/ci/appveyor/build_script.bat
+++ b/ci/appveyor/build_script.bat
@@ -17,7 +17,6 @@ SET "ZIGPREFIXPATH=%APPVEYOR_BUILD_FOLDER%\llvm+clang-6.0.0-win64-msvc-release"
 
 call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
->>>>>>> origin/master
 
 mkdir %ZIGBUILDDIR%
 cd %ZIGBUILDDIR%