cleaned up a merge artifact