removing uneeded files from merge