change newfile#6

clzlyl wants to merge 4 commits intochenlinzhong:masterchenlinzhong/file-split:masterfrom

clzlyl:test-confictclzlyl/file-split:test-confictCopy head branch name to clipboard