Readme update
Fix conflicts