merge files using diff
test func
Merge pull request #1 from ZhuoranLyu/master

merge files from cici