operation on branch ximing
add a line at feature1
add a line at master
conflict fixed
add merge
merge with no-ff
fix bug 101
merged bug fix 101