updated a file:merge
remove the a file: rename
合并代码
remove the excess file merge.txt~