change content
AND simple
$ simple
conflict fixed