add a simple plain text
new commit
master commit
conflict fixed
add merge
merge with no-ff