resolve conflict

src/_nebari/upgrade.py

@@ -8,6 +8,7 @@
 from typing import Any, ClassVar, Dict
 
 import rich
+from packaging.version import Version
 from pydantic import ValidationError
 from rich.prompt import Prompt