add merge alias in gitconfig