remove odd merge artifact