#merge conflict #git conflict #branching pain #vcs error #code clash #resolving conflict