add branch test
and simple
$ simple
conflict fixed