fixed small merge artifact