removed files from merge