learn git branch
add a line in README.md
simple
conflict fixed
add merge
merge with no-ff
del README.txt