AND simple
& simple
conflict fixed
add merge
merge with no-ff
fixed bug
merged buf fix 101
git stash test
merge dev -- for stash test