merge with no-ff
fix bug 101
merged bug fix 101
conflit1
merge &fix cm.txt
merge again