Fix problem in merge