Fix merge conflict issue.

Author: gottesmm

test/Concurrency/transfernonsendable_asynclet.swift

@@ -58,6 +58,15 @@ struct TwoFieldKlassBox {
   var k2 = NonSendableKlass()
 }
 
+actor CustomActorInstance {}
+
+@globalActor
+struct CustomActor {
+  static let shared = CustomActorInstance()
+}
+
+@CustomActor func transferToCustomInt<T>(_ t: T) async -> Int { 5 }
+
 /////////////////////////////////////
 // MARK: Async Let Let Actor Tests //
 /////////////////////////////////////
@@ -279,7 +288,9 @@ func asyncLet_Let_ActorIsolated_CallBuriedInOtherExpr3() async {
 func asyncLet_Let_ActorIsolated_CallBuriedInOtherExpr4() async {
   let x = NonSendableKlass()
 
-  async let y = useValue(transferToMainInt(x) + transferToMainInt(x))
+  async let y = useValue(transferToMainInt(x) + transferToMainInt(x)) // expected-warning {{sending 'x' risks causing data races}}
+  // expected-note @-1 {{sending 'x' to main actor-isolated global function 'transferToMainInt' risks causing data races between main actor-isolated and local nonisolated uses}}
+  // expected-note @-2:67 {{access can happen concurrently}}
 
   let _ = await y
 }
@@ -292,7 +303,7 @@ func asyncLet_Let_ActorIsolated_CallBuriedInOtherExpr5() async {
   async let y = useValue(transferToMainInt(x) + transferToCustomInt(x))
   // expected-warning @-1 {{sending 'x' risks causing data races}}
   // expected-note @-2 {{sending 'x' to main actor-isolated global function 'transferToMainInt' risks causing data races between main actor-isolated and local nonisolated uses}}
-  // expected-note @-3:49 {{access can happen concurrently}}
+  // expected-note @-3:69 {{access can happen concurrently}}
 
   let _ = await y
 }