Conflicts resolved: - hermes env: keep OLLAMA_HOST=ollama-cpu + master's new vars - ollama→ollama-cpu rename: keep our rename over master's ollama
Conflicts resolved: - hermes env: keep OLLAMA_HOST=ollama-cpu + master's new vars - ollama→ollama-cpu rename: keep our rename over master's ollama