SOlve a merge issue