adding a new line in dev branch
And simple
& simple
fix conflict
commit on dev
merge from dev no ff
rm the last line
merge from dev
fix conflict