modify the newfile in skychen
modify the newfile in skychen again
Merge branch 'skychen'
correct conflict