Fix mis-merge in test case

Author: DougGregor

test/Interop/Cxx/class/safe-interop-mode.swift

@@ -65,11 +65,7 @@ import CxxStdlib
 func useUnsafeParam(x: Unannotated) { // expected-note{{reference to unsafe struct 'Unannotated'}}
 }
 
-<<<<<<< HEAD
-// expected-warning@+2{{global function 'useUnsafeParam2' involves unsafe code; use '@unsafe' to indicate that its use is not memory-safe}}{{11:1-1=@unsafe }}
-=======
-// expected-warning@+2{{global function 'useUnsafeParam2' has an interface that is not memory-safe}}{{10:1-1=@unsafe }}
->>>>>>> ad874db0851 (Implement an `unsafe` expression to cover uses of unsafe constructs)
+// expected-warning@+2{{global function 'useUnsafeParam2' has an interface that is not memory-safe}}{{11:1-1=@unsafe }}
 @available(SwiftStdlib 5.8, *)
 func useUnsafeParam2(x: UnsafeReference) { // expected-note{{reference to unsafe class 'UnsafeReference'}}
 }