diff --git a/piker/data/_sampling.py b/piker/data/_sampling.py
index e52fd93a..cadc4726 100644
--- a/piker/data/_sampling.py
+++ b/piker/data/_sampling.py
@@ -15,19 +15,26 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 """
+<<<<<<< HEAD
 Sampling and broadcast machinery for (soft) real-time delivery of
 financial data flows.
+=======
+Data buffers for fast shared humpy.
+>>>>>>> 78e5394 (Type annot updates)
 
 """
+from __future__ import annotations
 import time
+from typing import TYPE_CHECKING
 
 import tractor
 import trio
 from trio_typing import TaskStatus
 
-from ._sharedmem import ShmArray
 from ..log import get_logger
 
+if TYPE_CHECKING:
+    from ._sharedmem import ShmArray
 
 log = get_logger(__name__)
 
diff --git a/piker/data/feed.py b/piker/data/feed.py
index 611d79ce..d24aa434 100644
--- a/piker/data/feed.py
+++ b/piker/data/feed.py
@@ -20,6 +20,7 @@ Data feed apis and infra.
 This module is enabled for ``brokerd`` daemons.
 
 """
+from __future__ import annotations
 from dataclasses import dataclass, field
 from contextlib import asynccontextmanager
 from functools import partial