a conflicted commit
a conflict
a new conflict
fixed