modify
master
conflict fixed
new branch dev
merge with no-ff