change to git merge script