in branch dev
AND simple
& simple
conflict fixed
branch management
merge with no-ff
fix bug 101
merged bug fix 101
test bug branch
my fault