add merge
merge with no-ff
add something else
add ./config
merge with no-ff 2th
add in dev
 edit to in master