diff --git a/windows_bat/PokemonGo-Bot-Install.bat b/windows_bat/PokemonGo-Bot-Install.bat
index aa02bb21bd..99ff76ae9e 100755
--- a/windows_bat/PokemonGo-Bot-Install.bat
+++ b/windows_bat/PokemonGo-Bot-Install.bat
@@ -96,7 +96,6 @@ if "%OS%" == "32-BIT" (
 @ECHO.
 @ECHO.
 @ECHO.
-<<<<<<< HEAD
 
 
 
@@ -126,9 +125,6 @@ if exist %DownPath%\%GitFName86% call:installit %GitFName86% /SILENT
 if exist %DownPath%\%PythonFName86% call:installit %PythonFName86% /quiet
 @ECHO Installing Visual C++ for Python...
 if exist %DownPath%\%VisualFName% call:installit %VisualFName% /quiet
-=======
-@ECHO ---- If you already have a config.json and a userdata.js, copy to the same folder as this batch file.
->>>>>>> parent of 9db2798... Update PokemonGo-Bot-Install.bat
 @ECHO.
 @ECHO.
 @ECHO.
@@ -208,7 +204,7 @@ if exist %PGBotPath% rmdir %PGBotPath% /s /q
 if not exist %PGBotPath% md %PGBotPath%
 cd C:\Python27\
 pip2 install --upgrade virtualenv
-git clone --recursive -b dev https://github.com/PokemonGoF/PokemonGo-Bot %PGBotPath%
+git clone --recursive -b master https://github.com/PokemonGoF/PokemonGo-Bot %PGBotPath%
 if "%OS%" == "32-BIT" pip2 install --upgrade %PGBotPath%\windows_bat\PyYAML-3.11-cp27-cp27m-win32.whl
 if "%OS%" == "64-BIT" pip2 install --upgrade %PGBotPath%\windows_bat\PyYAML-3.11-cp27-cp27m-win_amd64.whl
 cd %PGBotPath%
@@ -249,7 +245,6 @@ CLS
 @ECHO.
 @ECHO Remember to configure both config.json and userdata.js!
 @ECHO.
-<<<<<<< HEAD
 @ECHO.
 @ECHO.
 @ECHO "%PGBotPath%/configs/config.json"
@@ -259,14 +254,9 @@ CLS
 @ECHO "%PGBotPath%/web/config/userdata.js"
 @ECHO INSTRUCTIONS:
 @ECHO "https://github.com/PokemonGoF/PokemonGo-Bot/blob/master/docs/google_map.md"
-=======
-@ECHO "C:/Python27/PokemonGo-Bot/configs/config.json"
-@ECHO.
-@ECHO "C:/Python27/PokemonGo-Bot/web/config/userdata.js"
->>>>>>> parent of 9db2798... Update PokemonGo-Bot-Install.bat
 @ECHO.
 @ECHO To get an Google Map API Key:
-@ECHO https://developers.google.com/maps/documentation/javascript/get-api-key
+@ECHO "https://developers.google.com/maps/documentation/javascript/get-api-key"
 @ECHO.
 @ECHO.
 @ECHO.
@@ -276,4 +266,4 @@ CLS
 
 :eof
 ENDLOCAL
-exit
+exit
\ No newline at end of file
diff --git a/windows_bat/PokemonGo-Bot-Repair.bat b/windows_bat/PokemonGo-Bot-Repair.bat
deleted file mode 100755
index 55c9171c82..0000000000
--- a/windows_bat/PokemonGo-Bot-Repair.bat
+++ /dev/null
@@ -1,79 +0,0 @@
-TITLE PokemonGo-Bot Repair
-@ECHO OFF
-CLS
-
-:init
-setlocal DisableDelayedExpansion
-set "batchPath=%~0"
-for %%k in (%0) do set batchName=%%~nk
-set "vbsGetPrivileges=%temp%\OEgetPriv_%batchName%.vbs"
-setlocal EnableDelayedExpansion
-
-:checkPrivileges
-NET FILE 1>NUL 2>NUL
-if '%errorlevel%' == '0' ( goto gotPrivileges ) else ( goto getPrivileges )
-
-:getPrivileges
-if '%1'=='ELEV' (echo ELEV & shift /1 & goto gotPrivileges)
-ECHO.
-
-ECHO Set UAC = CreateObject^("Shell.Application"^) > "%vbsGetPrivileges%"
-ECHO args = "ELEV " >> "%vbsGetPrivileges%"
-ECHO For Each strArg in WScript.Arguments >> "%vbsGetPrivileges%"
-ECHO args = args ^& strArg ^& " "  >> "%vbsGetPrivileges%"
-ECHO Next >> "%vbsGetPrivileges%"
-ECHO UAC.ShellExecute "!batchPath!", args, "", "runas", 1 >> "%vbsGetPrivileges%"
-"%SystemRoot%\System32\WScript.exe" "%vbsGetPrivileges%" %*
-exit /B
-
-:gotPrivileges
-setlocal & pushd .
-cd /d %~dp0
-if '%1'=='ELEV' (del "%vbsGetPrivileges%" 1>nul 2>nul  &  shift /1)
-@ECHO ON
-@ECHO.
-@ECHO.
-@ECHO.
-@ECHO --------------------Creating Backup--------------------
-@ECHO.
-@ECHO.
-@ECHO.
-RMDIR C:\Python27\Backup /s /q
-MKDIR C:\Python27\Backup
-COPY C:\Python27\PokemonGo-Bot\encrypt*.* C:\Python27\Backup
-COPY C:\Python27\PokemonGo-Bot\configs\config.json C:\Python27\Backup
-COPY C:\Python27\PokemonGo-Bot\web\config\userdata.js C:\Python27\Backup
-@ECHO.
-@ECHO.
-@ECHO.
-@ECHO --------------------Downloading PokemonGo-Bot--------------------
-@ECHO.
-@ECHO.
-@ECHO.
-RMDIR C:\Python27\PokemonGo-Bot /s /q
-cd C:\Python27\
-pip2 install --upgrade pip
-pip2 install --upgrade virtualenv
-pip2 install --upgrade "%~dp0\PyYAML-3.11-cp27-cp27m-win32.whl"
-pip2 install --upgrade "%~dp0\PyYAML-3.11-cp27-cp27m-win_amd64.whl"
-git clone --recursive -b master https://github.com/PokemonGoF/PokemonGo-Bot
-pip2 install --upgrade -r C:/Python27/PokemonGo-Bot/requirements.txt
-cd C:/Python27/PokemonGo-Bot/
-virtualenv .
-call C:\Python27\PokemonGo-Bot\Scripts\activate.bat
-pip2 install --upgrade -r C:/Python27/PokemonGo-Bot/requirements.txt
-@ECHO.
-@ECHO.
-@ECHO.
-@ECHO --------------------Restoring Backup--------------------
-@ECHO.
-@ECHO.
-@ECHO.
-COPY C:\Python27\Backup\encrypt*.* C:\Python27\PokemonGo-Bot\
-COPY C:\Python27\Backup\config.json C:\Python27\PokemonGo-Bot\configs\
-COPY C:\Python27\Backup\userdata.js C:\Python27\PokemonGo-Bot\web\config\
-RMDIR C:\Python27\Backup /s /q
-@ECHO.
-@ECHO.
-@ECHO.
-@PAUSE
\ No newline at end of file
diff --git a/windows_bat/PokemonGo-Bot-Start.bat b/windows_bat/PokemonGo-Bot-Start.bat
index 04bc615ca6..8b7d07a0d8 100755
--- a/windows_bat/PokemonGo-Bot-Start.bat
+++ b/windows_bat/PokemonGo-Bot-Start.bat
@@ -49,7 +49,6 @@ CLS
 CD..
 git pull
 git submodule update --init --recursive
-git submodule foreach git pull origin master
 @ECHO.
 @ECHO WARNING: Verify if the Config.json file got updated. If Yes, check if your modifications are still valid before proceeding.
 @ECHO.
@@ -101,4 +100,4 @@ goto:eof
 
 
 :eof
-exit
+exit
\ No newline at end of file