Updated README to remove merge conflict markers