dev add merge
merge with no-ff
fix bug 404
merge bug fix 404