Remove README merge conflicts