commit on feature1 branch
commit on master
conflict fixed
add merge
merge with no-ff
add commit before git stash
modified note.txt