I see that you were already able to resolve this yourself. However, I ran into a similar error message/conflict issue when trying to update a conda
environment that had substantially diverged from the version I currently have that was built from a YAML file.
Since the issue I had is related and builds on the YAML suggestion by @merv, here's what worked (and confirmed with our maintainer as better than trying to fix individual conflicts):
conda activate env_name
conda list --revisions > ~/env_name-revision-list.txt
conda list - e > ~/env_name-requirements.txt
v4.14
:conda activate # deactivate env_name
conda env remove -p path_to_environment # e.g. ~/anaconda3/envs/env_name
After completely removing the existing environment that had the conflict(s), then you can proceed with creating the updated environment (with the same name) from a YAML file with the most recent versions, e.g. conda env create -f /path_to_envs/envs/env_name.yaml