a change commited on dev
add a new file in feature1 branch
file changed happen on master
conflict fixed
add merge
merge with no-ff