- added merge.bat again