dev branch
commit from feature1
commit from master
conflict fixed
commit from dev branch
merge with no-ff
check in from dev branch again
fix issue 101
merge but fix 101