diff --git a/_RebuildReleaseAndBuildUnits.bat b/_RebuildReleaseAndBuildUnits.bat
index a5613c8df..0d93b428a 100644
--- a/_RebuildReleaseAndBuildUnits.bat
+++ b/_RebuildReleaseAndBuildUnits.bat
@@ -1,3 +1,4 @@
+<<<<<<< Updated upstream
 call Studio.bat /t:rebuild "/property:Configuration=Release" "/p:Platform=Any CPU" PascalABCNET.sln
 
 @IF %ERRORLEVEL% NEQ 0 GOTO ERROR
@@ -30,4 +31,37 @@ GOTO EXIT
 :ERROR
 PAUSE
 
+=======
+call Studio.bat /t:rebuild "/property:Configuration=Release" "/p:Platform=Any CPU" PascalABCNET.sln
+
+@IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+
+cd ReleaseGenerators
+..\bin\pabcnetc RebuildStandartModules.pas /rebuild
+@IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+
+cd PABCRtl
+..\..\bin\pabcnetc PABCRtl.pas /rebuild
+@IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+..\sn.exe -Vr PABCRtl.dll
+..\sn.exe -R PABCRtl.dll KeyPair.snk
+..\sn.exe -Vu PABCRtl.dll
+copy PABCRtl.dll ..\..\bin\Lib
+
+cd ..
+ExecHide.exe gacutil.exe /u PABCRtl
+ExecHide.exe gacutil.exe /i ..\bin\Lib\PABCRtl.dll
+
+..\bin\pabcnetc RebuildStandartModules.pas /rebuild
+@IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+
+cd ..\bin
+REM MPGORunner.exe
+cd ..
+GOTO EXIT
+
+:ERROR
+PAUSE
+
+>>>>>>> Stashed changes
 :EXIT
\ No newline at end of file