readme
conflict fixed