New files from merge