re-bake the readme now the conflicts are nuked