removing merge leftovers