fix rebase conflicts and remove ctx from newConnection call in test

Author: Divjot Arora

x/mongo/driver/topology/connection_test.go

@@ -90,7 +90,7 @@ func TestConnection(t *testing.T) {
 				handshakerError := errors.New("handshaker error")
 				var got error
 
-				conn, err := newConnection(context.Background(), address.Address(""),
+				conn, err := newConnection(address.Address(""),
 					WithHandshaker(func(Handshaker) Handshaker {
 						return &testHandshaker{
 							getDescription: func(context.Context, address.Address, driver.Connection) (description.Server, error) {

x/mongo/driver/topology/server_test.go

@@ -237,12 +237,7 @@ func TestServer(t *testing.T) {
 		s.pool.connected = connected
 
 		wce := driver.WriteConcernError{}
-<<<<<<< HEAD
 		s.ProcessError(&wce, initConnection{})
-=======
-		// Use initConnection as it always returns false for Stale().
-		s.ProcessError(wce, initConnection{})
->>>>>>> 1b2c6365... GODRIVER-1489 Implement streaming heartbeat protocol
 
 		// should not be a LastError
 		require.Nil(t, s.Description().LastError)