diff --git a/environment.yaml b/environment.yaml
index 7a1f248f6..556c5f50c 100644
--- a/environment.yaml
+++ b/environment.yaml
@@ -41,25 +41,11 @@ dependencies:
 - pip:
   - dataclasses-json==0.6.7
   - domain-utils==0.7.1
-<<<<<<< HEAD
   - honeycomb-opentelemetry==0.5.0b0
   - jsonschema==4.23.0
+  - opentelemetry-api==1.25.0
   - tranco==0.8.1
   - types-pyyaml==6.0.12.20240311
   - types-redis==4.6.0.20240425
-||||||| parent of 149d0b4 (feat(otel): wip, needs async context manager support)
-  - honeycomb-opentelemetry==0.2.3b0
-  - jsonschema==4.21.1
-  - tranco==0.7.1
-  - types-pyyaml==6.0.12.12
-  - types-redis==4.6.0.20240106
-=======
-  - honeycomb-opentelemetry==0.2.3b0
-  - jsonschema==4.21.1
-  - opentelemetry-api==1.20.0
-  - tranco==0.7.1
-  - types-pyyaml==6.0.12.12
-  - types-redis==4.6.0.20240106
->>>>>>> 149d0b4 (feat(otel): wip, needs async context manager support)
   - types-tabulate==0.9.0.20240106
 name: openwpm