fix: merge conflicts

Author: Denny09310

src/ElectronNET.API/API/Entities/Cookie.cs

@@ -50,4 +50,4 @@ public class Cookie
         /// </summary>
         public long ExpirationDate { get; set; }
     }
-}
+}

src/ElectronNET.IntegrationTests/Tests/BrowserWindowTests.cs

@@ -48,7 +48,7 @@ public async Task Can_set_and_get_position()
             this.fx.MainWindow.SetPosition(134, 246);
             await Task.Delay(500);
             var pos = await this.fx.MainWindow.GetPositionAsync();
-            pos.Should().BeEquivalentTo([134, 246]);
+            pos.Should().BeEquivalentTo(new[] { 134, 246 });
         }
 
         [Fact]

src/ElectronNET.IntegrationTests/Tests/IpcMainTests.cs

@@ -45,7 +45,7 @@ public async Task Ipc_RemoveAllListeners_stops_receiving()
         [Fact]
         public async Task Ipc_OnSync_returns_value()
         {
-            Electron.IpcMain.OnSync("ipc-sync-test", (obj) =>
+            Electron.IpcMain.OnSync("ipc-sync-test", obj =>
             {
                 obj.Should().NotBeNull();
                 return "pong";