creating a branch
and simple
$ simple
conflict fixed
branch dev
merge with no-ff
wx
mjj
merge wx
 fixed io