branch commit
master commit
conflict fixed
add merge
merge with no-ff
new line
fix bug 1
merge iss1
understand stash
conflict fix