diff --git a/pangeo_forge_runner/commands/bake.py b/pangeo_forge_runner/commands/bake.py
index 9a8a044..d5ff3f2 100644
--- a/pangeo_forge_runner/commands/bake.py
+++ b/pangeo_forge_runner/commands/bake.py
@@ -18,10 +18,6 @@
 from ..bakery.flink import FlinkOperatorBakery
 from ..bakery.local import LocalDirectBakery
 from ..plugin import get_injections, get_injectionspecs_from_entrypoints
-<<<<<<< HEAD
-=======
-from ..storage import InputCacheStorage, TargetStorage
->>>>>>> main
 from ..stream_capture import redirect_stderr, redirect_stdout
 from .base import BaseCommand, common_aliases, common_flags