Addition to README for merge conflict