test commit!
test commit
test commit
commit hello world
made a branch
switch back to master
fix issue 53
fix the hot bug
afer hotbug change something
finish issue 53
Merge branch 'iss53'
Merge branch 'testing'
conflict1 commit
conflict2 commit
fix the conflict
test reabase