fix conflicts

Author: carolynzech

library/alloc/Cargo.toml

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