README edits
merged README conflict