diff --git a/src/librustc_mir/interpret/const_eval.rs b/src/librustc_mir/interpret/const_eval.rs
index 83c535e962fe..8e77af7526e3 100644
--- a/src/librustc_mir/interpret/const_eval.rs
+++ b/src/librustc_mir/interpret/const_eval.rs
@@ -472,7 +472,8 @@ fn to_str<'a, 'tcx, 'mir>(
     if let Value::ScalarPair(ptr, len) = val {
         let len = len.not_undef()?.to_bits(ecx.memory.pointer_size())?;
         let bytes = ecx.memory.read_bytes(ptr.not_undef()?, Size::from_bytes(len as u64))?;
-        let str = ::std::str::from_utf8(bytes).map_err(|err| EvalErrorKind::ValidationFailure(err.to_string()))?;
+        let str = ::std::str::from_utf8(bytes)
+            .map_err(|err| EvalErrorKind::ValidationFailure(err.to_string()))?;
         Ok(Symbol::intern(str))
     } else {
         bug!("panic arg is not a str")
diff --git a/src/librustc_mir/interpret/terminator/mod.rs b/src/librustc_mir/interpret/terminator/mod.rs
index 782c033e2df0..aec7bb0c0d60 100644
--- a/src/librustc_mir/interpret/terminator/mod.rs
+++ b/src/librustc_mir/interpret/terminator/mod.rs
@@ -252,16 +252,11 @@ impl<'a, 'mir, 'tcx, M: Machine<'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M> {
                     // Second argument must be a tuple matching the argument list of sig
                     let snd_ty = real_sig.inputs_and_output[1];
                     match snd_ty.sty {
-<<<<<<< HEAD
                         ty::Tuple(tys) if sig.inputs().len() == tys.len() =>
-                            if sig.inputs().iter().zip(tys).all(|(ty, real_ty)| check_ty_compat(ty, real_ty)) {
-=======
-                        ty::TyTuple(tys) if sig.inputs().len() == tys.len() =>
                             if sig.inputs()
-                                  .iter()
-                                  .zip(tys)
-                                  .all(|(ty, real_ty)| check_ty_compat(ty, real_ty)) {
->>>>>>> 7d30ba9... Fixup long code lines
+                                .iter()
+                                .zip(tys)
+                                .all(|(ty, real_ty)| check_ty_compat(ty, real_ty)) {
                                 return Ok(true)
                             },
                         _ => {}