diff --git a/manifest.toml b/manifest.toml
index 28ed2b4..378781a 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -28,7 +28,3 @@ gleam_time = { version = ">= 1.1.0 and < 2.0.0" }
 gleeunit = { version = ">= 1.0.0 and < 2.0.0" }
 multipart_form = { version = ">= 1.1.0 and < 2.0.0" }
 status_code = { version = ">= 1.0.0 and < 2.0.0" }
-<<<<<<< HEAD
-stratus = { version = ">= 3.0.0 and < 4.0.0" }
-=======
->>>>>>> 3cbcf5b (thats enough for a commit)