Removing garbage from merge