readme for dev
add merge
merge dev to master with no-ff
update
add notes
update note
update note]