Fixes syntax errors in README

Also removes some merge conflict noise.