conflicts and branching in git