add merge
merge with no-ff
fix issue
merge issue branch