add a conflict in git