merge with main

eppo_core/Cargo.toml

@@ -10,8 +10,6 @@ categories = ["config"]
 rust-version = "1.75.0"
 
 [features]
-# TODO: Remove this line before merging
-default = ["event_ingestion"]
 # Unstable feature flag for an upcoming feature.
 event_ingestion = ["dep:uuid", "dep:linked_hash_set"]
 # Add implementation of `FromPyObject`/`ToPyObject` for some types.
@@ -40,8 +38,12 @@ serde-bool = "0.1.3"
 serde_json = "1.0.116"
 serde_with = { version = "3.11.0", default-features = false, features = ["base64", "hex", "macros"] }
 thiserror = "2.0.3"
+<<<<<<< HEAD
 linked_hash_set = { version = "0.1.5", optional = true }
 tokio = { version = "1.34.0", default-features = false, features = ["macros", "sync", "rt", "time", "test-util"] }
+=======
+tokio = { version = "1.34.0", default-features = false, features = ["macros", "sync", "rt", "time"] }
+>>>>>>> main
 url = "2.5.0"
 uuid = { version = "1.11.0", features = ["v4", "serde"], optional = true }