resolved conflict in git