diff --git a/crates/core_arch/src/wasm32/mod.rs b/crates/core_arch/src/wasm32/mod.rs
index 82674a0d0b..92a1e61785 100644
--- a/crates/core_arch/src/wasm32/mod.rs
+++ b/crates/core_arch/src/wasm32/mod.rs
@@ -172,6 +172,7 @@ pub fn f64_nearest(a: f64) -> f64 {
 #[unstable(feature = "wasm_numeric_instr", issue = "133908")]
 pub fn f64_sqrt(a: f64) -> f64 {
     crate::intrinsics::sqrtf64(a)
+<<<<<<< HEAD
 }
 
 unsafe extern "C-unwind" {
@@ -201,4 +202,6 @@ unsafe extern "C-unwind" {
 pub unsafe fn throw<const TAG: i32>(ptr: *mut u8) -> ! {
     static_assert!(TAG == 0); // LLVM only supports tag 0 == C++ right now.
     wasm_throw(TAG, ptr)
+=======
+>>>>>>> e8bb3cae4cd2b04bdc252cdf79102717db2b2d8d
 }
diff --git a/rust-version b/rust-version
index 1ced6098ac..e313eada45 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-32e7a4b92b109c24e9822c862a7c74436b50e564
+73e6c9ebd9123154a196300ef58e30ec8928e74e