add git merge instructions