fix git merge command

On branch master
Changes to be committed:

	modified:   init.sh
	modified:   scripts/middleman.sh