From 97fe5c21a156e0ba1ad44fe5455dd4bc72fdc6af Mon Sep 17 00:00:00 2001
From: dylanbulfinMS <95251881+dylanbulfinMS@users.noreply.github.com>
Date: Tue, 1 Mar 2022 18:17:14 -0500
Subject: [PATCH] Fix issues with merging

---
 iothub/device/src/Transport/Amqp/AmqpConnectionHolder.cs | 3 +--
 iothub/device/src/Transport/Amqp/AmqpTransportHandler.cs | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/iothub/device/src/Transport/Amqp/AmqpConnectionHolder.cs b/iothub/device/src/Transport/Amqp/AmqpConnectionHolder.cs
index aaf9245af0..5d9681be70 100644
--- a/iothub/device/src/Transport/Amqp/AmqpConnectionHolder.cs
+++ b/iothub/device/src/Transport/Amqp/AmqpConnectionHolder.cs
@@ -10,8 +10,7 @@
 using Microsoft.Azure.Devices.Client.Exceptions;
 using Microsoft.Azure.Devices.Client.Extensions;
 using Microsoft.Azure.Devices.Client.Transport.AmqpIot;
-using System.Collections.Generic;
-using System.Linq;
+using Microsoft.Azure.Devices.Shared;
 
 namespace Microsoft.Azure.Devices.Client.Transport.Amqp
 {
diff --git a/iothub/device/src/Transport/Amqp/AmqpTransportHandler.cs b/iothub/device/src/Transport/Amqp/AmqpTransportHandler.cs
index 5571cd551f..67430620d5 100644
--- a/iothub/device/src/Transport/Amqp/AmqpTransportHandler.cs
+++ b/iothub/device/src/Transport/Amqp/AmqpTransportHandler.cs
@@ -25,7 +25,7 @@ internal class AmqpTransportHandler : TransportHandler
         protected AmqpUnit _amqpUnit;
         private readonly Action<TwinCollection> _onDesiredStatePatchListener;
         private readonly object _lock = new object();
-        private readonly ConcurrentDictionary<string, TaskCompletionSource<Twin>> _twinResponseCompletions = new ConcurrentDictionary<string, TaskCompletionSource<Twin>>();
+        private readonly ConcurrentDictionary<string, TaskCompletionSource<AmqpMessage>> _twinResponseCompletions = new ConcurrentDictionary<string, TaskCompletionSource<AmqpMessage>>();
         private bool _closed;
 
         static AmqpTransportHandler()