Fix merging issues

src/Avalonia.Native.OSX/clipboard.mm

@@ -24,7 +24,9 @@ public:
 
     virtual HRESULT Clear()
     {
-        [[NSPasteboard generalPasteboard] clearContents];
+        @autoreleasepool {
+            [[NSPasteboard generalPasteboard] clearContents];
+        }
         return S_OK;
     }
 };

src/Avalonia.Native/Stubs.cs

@@ -28,12 +28,8 @@ namespace Avalonia.Native
         public Task<string> GetTextAsync()
         {
             var outPtr = _native.GetText();
-<<<<<<< Updated upstream
-            return Task.FromResult(Marshal.PtrToStringAnsi(outPtr));
-=======
             var text = Marshal.PtrToStringAnsi(outPtr);
             return Task.FromResult(text);
->>>>>>> Stashed changes
         }
 
         public Task SetTextAsync(string text)