test merge2
merge files
permission change