add readme
simple
& simple
conflict fixed