Remove merge conflict message from README