Remove conflict markers from README

These probably snuck in during the last set of merges.