C

Conflicts and branching in Git