test the branch dev
haha
test chongtu
solve confilct
change by dev
change by master
conflict fixed
fix bug
Merge branch 'dev'