fix(merge-conflict): remove HEAD >>> stuff from merge conflict