Updated README to not have merge conflicts.