Removed a merge artifact