new line in dev
merge with no-ff
add sth in dev branch
merge from master