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

This assumes keeping the `exports.compare` function (figured it was the safest route)