Removing merge garbage