remove extra files from merge