Added merge alias to gitconfig