Fix in merge