Resolve various merge conflicts

Author: mejrs

compiler/rustc_error_messages/locales/en-US/mir_build.ftl

@@ -292,7 +292,7 @@ mir_build_borrow_of_moved_value = borrow of moved value
     .label = value moved into `{$name}` here
     .occurs_because_label = move occurs because `{$name}` has type `{$ty}` which does not implement the `Copy` trait
     .value_borrowed_label = value borrowed here after move
-    .suggest_borrowing = borrow this binding in the pattern to avoid moving the value
+    .suggestion = borrow this binding in the pattern to avoid moving the value
 
 mir_build_multiple_mut_borrows = cannot borrow value as mutable more than once at a time
     .label = first mutable borrow, by `{$name}`, occurs here

compiler/rustc_error_messages/src/lib.rs

@@ -57,8 +57,8 @@ fluent_messages! {
     lint => "../locales/en-US/lint.ftl",
     metadata => "../locales/en-US/metadata.ftl",
     middle => "../locales/en-US/middle.ftl",
-    mir_dataflow => "../locales/en-US/mir_dataflow.ftl",
     mir_build => "../locales/en-US/mir_build.ftl",
+    mir_dataflow => "../locales/en-US/mir_dataflow.ftl",
     monomorphize => "../locales/en-US/monomorphize.ftl",
     parse => "../locales/en-US/parse.ftl",
     passes => "../locales/en-US/passes.ftl",