Removing merge remnants