add merge
merge with no-ff
fix bu 101
merged by bug fix 101
add yy.