Removing merge problem