add merge
merge with no-ff
fix bug 101
first update
merge issue-101
fix bug-101
merge bug-101
dev update1