added git merge tool alias. added absolute path for Z