commit on feature1
commit on master
confiliced fix
add merge
merge with no-ff