add commits
add conflicts
conflict fixed
testing no-ff
fixed conflict
step 1 - preparation
step2 - preparation again
modify - by cardin
modify - by cai
conflict fixed
step 3
merge with no-ff
fix issue-101
merged bug fix 101