fix conflict in git config