diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test/Connection/ConnectionServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.Test/Connection/ConnectionServiceTests.cs
index 1038a1ff..95190752 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.Test/Connection/ConnectionServiceTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.Test/Connection/ConnectionServiceTests.cs
@@ -3,12 +3,13 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
+using System;
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.Connection;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol;
+using Microsoft.SqlTools.ServiceLayer.Connection;
+using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol;
 using Microsoft.SqlTools.Test.Utility;
-using Moq;
+using Moq;
 using Xunit;
 
 namespace Microsoft.SqlTools.ServiceLayer.Test.Connection
@@ -27,11 +28,11 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Connection
         {
             // connect to a database instance 
             string ownerUri = "file://my/sample/file.sql";
-            var connectionResult =
+            var connectionResult =
                 TestObjects.GetTestConnectionService()
-                .Connect(new ConnectParams()
-                {
-                    OwnerUri = ownerUri,
+                .Connect(new ConnectParams()
+                {
+                    OwnerUri = ownerUri,
                     Connection = TestObjects.GetTestConnectionDetails()
                 });
 
@@ -64,42 +65,42 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Connection
         }
 
         //[Fact]
-        //public void TestConnectRequestRegistersOwner()
-        //{
+        //public void TestConnectRequestRegistersOwner()
+        //{
         //    // Given a request to connect to a database
         //    var service = new ConnectionService(new TestSqlConnectionFactory());
         //    ConnectionDetails connectionDetails = TestObjects.GetTestConnectionDetails();
-        //    var connectParams = new ConnectParams()
-        //    {
-        //        OwnerUri = "file://path/to/my.sql",
-        //        Connection = connectionDetails
+        //    var connectParams = new ConnectParams()
+        //    {
+        //        OwnerUri = "file://path/to/my.sql",
+        //        Connection = connectionDetails
         //    };
 
         //    var endpoint = new Mock<IProtocolEndpoint>();
         //    Func<ConnectParams, RequestContext<ConnectResponse>, Task> connectRequestHandler = null;
         //    endpoint.Setup(e => e.SetRequestHandler(ConnectionRequest.Type, It.IsAny<Func<ConnectParams, RequestContext<ConnectResponse>, Task>>()))
-        //        .Callback<Func<ConnectParams, RequestContext<ConnectResponse>, Task>>(handler => connectRequestHandler = handler);
-
-        //    // when I initialize the service
-        //    service.InitializeService(endpoint.Object);
-
-        //    // then I expect the handler to be captured
-        //    Assert.NotNull(connectRequestHandler);
-
-        //    // when I call the service
-        //    var requestContext = new Mock<RequestContext<ConnectResponse>>();
-
-        //    connectRequestHandler(connectParams, requestContext);
-        //    // then I should get a live connection
-
-        //    // and then I should have 
-        //    // connect to a database instance 
-        //    var connectionResult =
+        //        .Callback<Func<ConnectParams, RequestContext<ConnectResponse>, Task>>(handler => connectRequestHandler = handler);
+
+        //    // when I initialize the service
+        //    service.InitializeService(endpoint.Object);
+
+        //    // then I expect the handler to be captured
+        //    Assert.NotNull(connectRequestHandler);
+
+        //    // when I call the service
+        //    var requestContext = new Mock<RequestContext<ConnectResponse>>();
+
+        //    connectRequestHandler(connectParams, requestContext);
+        //    // then I should get a live connection
+
+        //    // and then I should have 
+        //    // connect to a database instance 
+        //    var connectionResult =
         //        TestObjects.GetTestConnectionService()
         //        .Connect(TestObjects.GetTestConnectionDetails());
 
         //    // verify that a valid connection id was returned
-        //    Assert.True(connectionResult.ConnectionId > 0);
+        //    Assert.True(connectionResult.ConnectionId > 0);
         //}
     }
 }
diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test/LanguageServer/LanguageServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.Test/LanguageServer/LanguageServiceTests.cs
index 8ba18aae..80ea3ec9 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.Test/LanguageServer/LanguageServiceTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.Test/LanguageServer/LanguageServiceTests.cs
@@ -3,13 +3,8 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-<<<<<<< HEAD
 using System.Threading.Tasks;
 using Microsoft.SqlTools.ServiceLayer.Connection;
-=======
-using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.Connection;
->>>>>>> a40180bcb1203cfafc908e7a1e26e673f53393ac
 using Microsoft.SqlTools.ServiceLayer.LanguageServices;
 using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts;
 using Microsoft.SqlTools.Test.Utility;