Fixed merge artifact