git merge conflicts, parsed