Resolve conflicts

Author: tautschnig

library/core/src/str/pattern.rs

@@ -1921,14 +1921,10 @@ fn simd_contains(needle: &str, haystack: &str) -> Option<bool> {
 /// # Safety
 ///
 /// Both slices must have the same length.
-<<<<<<< HEAD
-#[cfg(all(target_arch = "x86_64", any(kani, target_feature = "sse2")))] // only called on x86
-=======
 #[cfg(any(
-    all(target_arch = "x86_64", target_feature = "sse2"),
+    all(target_arch = "x86_64", any(kani, target_feature = "sse2")),
     all(target_arch = "loongarch64", target_feature = "lsx")
 ))]
->>>>>>> subtree/library
 #[inline]
 #[requires(x.len() == y.len())]
 unsafe fn small_slice_eq(x: &[u8], y: &[u8]) -> bool {

library/std/Cargo.toml

@@ -23,14 +23,8 @@ unwind = { path = "../unwind" }
 hashbrown = { version = "0.15", default-features = false, features = [
     'rustc-dep-of-std',
 ] }
-<<<<<<< HEAD
-std_detect = { path = "../stdarch/crates/std_detect", public = true, default-features = false, features = [
-    'rustc-dep-of-std',
-] }
-safety = { path = "../contracts/safety" }
-=======
 std_detect = { path = "../std_detect", public = true }
->>>>>>> subtree/library
+safety = { path = "../contracts/safety" }
 
 # Dependencies of the `backtrace` crate
 rustc-demangle = { version = "0.1.24", features = ['rustc-dep-of-std'] }