dev branch first commit
AND simple
$ simple
conflict fixed