add merge
merge with no-ff
fix bug 101
merged bug fix 101
dev finish
merge dev to master