Delete unspotted merge conflicts