Fix merge artifact