diff --git a/installer-windows.bat b/installer-windows.bat
index abf2d99..f689cd6 100644
--- a/installer-windows.bat
+++ b/installer-windows.bat
@@ -36,6 +36,7 @@ echo Updating...
         @timeout /t 2 >nul 2>&1
     
     tar -xvzf %mcroot%/mods.tar.gz -C %modfolder%
+<<<<<<< HEAD
 
 :::      :+++++=
 :::      -++++++.
@@ -72,6 +73,8 @@ echo Updating...
 :::                                           ....
 
 for /f "delims=: tokens=*" %%A in ('findstr /b ::: "%~f0"') do @echo(%%A)
+=======
+>>>>>>> 2245d8798bc0de4d39bdc21bcede5eeb654c4f51
 echo Sigma!
 echo All done. C:
 echo This window will close in ten seconds.