rm test
2222
111
1112133546
111
22222
1111
1234556
123465
conflict fixed
add merge
merge with no-ff
commit addmerge