Added merge tool to git config