Remove another merge artifact