add a branch.txt
And branch.txt sth
add branch master
conflict fixed
 add mearge
merge with no-ff