Fixed some merge confilcts in README file