add merge
merge with no-ff
test color
Merge branch 'dev'