add more files from merge