Resolve conflicts

Author: tautschnig

library/alloc/Cargo.toml

@@ -16,12 +16,8 @@ bench = false
 
 [dependencies]
 core = { path = "../core", public = true }
-<<<<<<< HEAD
-compiler_builtins = { version = "=0.1.151", features = ['rustc-dep-of-std'] }
-safety = { path = "../contracts/safety" }
-=======
 compiler_builtins = { version = "=0.1.152", features = ['rustc-dep-of-std'] }
->>>>>>> subtree/library
+safety = { path = "../contracts/safety" }
 
 [features]
 compiler-builtins-mem = ['compiler_builtins/mem']

library/core/src/num/f32.rs

@@ -18,13 +18,9 @@ use crate::convert::FloatToInt;
 use crate::kani;
 use crate::num::FpCategory;
 use crate::panic::const_assert;
-<<<<<<< HEAD
 #[allow(unused_imports)]
 use crate::ub_checks::float_to_int_in_range;
-use crate::{intrinsics, mem};
-=======
 use crate::{cfg_match, intrinsics, mem};
->>>>>>> subtree/library
 
 /// The radix or base of the internal representation of `f32`.
 /// Use [`f32::RADIX`] instead.