commit commit
Minor readme updates
fixed merge conflicts