& simple
AND simple
123
conflict fixed
new
master
fixed
1111
add merge
merge with no-ff
fix bug
bug fix
4444
555
merge
refresh
fixed
merge bug
finished doing
merge with