removed a lingering merge artifact