Conflicts and branching in Git