removing garbage from merge