1.add a line
AND me
& me
and me
add haha
off-on
no-ff merge
fix bug
merge fixed a bug1
a push