add merge
gai zheng
fix bug 1
merged bug fix bug-1
add a file
delete a file
no modify
fix conflict