Update the README
Fix conflicts