Fix of failed merge