further edits to the README
resolve README conflicts