add merge
merge with no-ff
add hijk
merged bug fix 101