readme
solving conflict