Conflicts removed... but pyenv is enabled