Fixed README Conflicts

See commit for details.