add color to gitconfig and merge