branch test
in feature1
nod in master
conflict fixed
modi in dev
merge with no-ff
fix bug 101
merged bug fix 101