Removed Git conflict messages in README.md