change gitconfig
merge