second add dev
add msg1 on master
解决分支冲突