Remove README merge cruft