fix weird merge artifact