README updated
Fix conflicts