Updated README to resolve conflicts