create brance and switch to it
changes in branch dev
change the text in branch master
recon the conflict
test use new merge mode
test use new merge mode
merge with no-ff para generate a new commit