branch test
merge problem
merge step 2
conflict fixed
normal merge
fixe confllicts
normal merge again
bug 101 fixed
finished a new work