git merge tool added