Merge branch 'longwencan-edit1'
file1 is blank, rm file8
write to file1, add file8