add creating a new branch is quick
AND simple
$ simple
conflict fixed
add 补充远程仓库后面的内容