Fix merge conflicts

Author: avillega

resonate/resonate.py

@@ -12,7 +12,6 @@
 from resonate.coroutine import LFC, LFI, RFC, RFI
 from resonate.dependencies import Dependencies
 from resonate.message_sources import LocalMessageSource, Poller
-from resonate.models.durable_promise import DurablePromise
 from resonate.models.handle import Handle
 from resonate.options import Options
 from resonate.registry import Registry

tests/test_resonate.py

@@ -389,6 +389,7 @@ def test_rpc_validations(registry: Registry, func: Callable | str, kwargs: dict)
 
 @pytest.mark.parametrize("id", ["foo", "bar", "baz"])
 def test_get(resonate: Resonate, id: str) -> None:
+    resonate.promises.create(id=id, timeout=sys.maxsize)
     resonate.get(id)
     assert cmd(resonate) == Listen(id=id)