chore: resolve merge conflicts

Author: MaggieKimani1

src/Microsoft.OpenApi/Extensions/CollectionExtensions.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Microsoft.OpenApi.Extensions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Dictionary extension methods

src/Microsoft.OpenApi/Extensions/OpenApiExtensibleExtensions.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 using System;
+using System.Collections.Generic;
 
 namespace Microsoft.OpenApi
 {

src/Microsoft.OpenApi/Reader/V2/OpenApiOperationDeserializer.cs

@@ -5,7 +5,6 @@
 using System.Linq;
 using System;
 using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Interfaces;
 
 namespace Microsoft.OpenApi.Reader.V2
 {

src/Microsoft.OpenApi/Services/CopyReferences.cs

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
+using System.Collections.Generic;
+
 namespace Microsoft.OpenApi;
 internal class CopyReferences(OpenApiDocument target) : OpenApiVisitorBase
 {

src/Microsoft.OpenApi/Writers/OpenApiWriterSettings.cs

@@ -1,4 +1,6 @@
-namespace Microsoft.OpenApi
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Configuration settings to control how OpenAPI documents are written

test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
+using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using Xunit;

test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Net.Http;
 using System.Threading;

test/Microsoft.OpenApi.Tests/Extensions/CollectionExtensionsTests.cs

@@ -4,11 +4,6 @@
 using System.IO;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Models.Interfaces;
-using Microsoft.OpenApi.Models.References;
-using Microsoft.OpenApi.Writers;
 using VerifyXunit;
 using Xunit;
 

test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Threading.Tasks;

test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Threading.Tasks;