add merge, manage branch stratergy
merge with no-ff
bug101 is fixed
merge bug fix 101
test bug branch
to fix conglict