Update Readme
Fix conflicts