From 8f510a6243ddb4794d19167be879df2f48876137 Mon Sep 17 00:00:00 2001
From: Andrew Welker <awelker@pepperdash.com>
Date: Thu, 26 Oct 2023 23:24:01 -0500
Subject: [PATCH] fix: correct minor leftover merge issues

---
 src/PepperDash.Essentials.Core/Factory/DeviceFactory.cs   | 2 ++
 src/PepperDash.Essentials.Core/Room/EssentialsRoomBase.cs | 6 +-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/PepperDash.Essentials.Core/Factory/DeviceFactory.cs b/src/PepperDash.Essentials.Core/Factory/DeviceFactory.cs
index 0a7c742d..bfc32661 100644
--- a/src/PepperDash.Essentials.Core/Factory/DeviceFactory.cs
+++ b/src/PepperDash.Essentials.Core/Factory/DeviceFactory.cs
@@ -1,4 +1,6 @@
 extern alias Full;
+
+using Crestron.SimplSharp;
 using Crestron.SimplSharp.Reflection;
 using Full.Newtonsoft.Json.Linq;
 using PepperDash.Core;
diff --git a/src/PepperDash.Essentials.Core/Room/EssentialsRoomBase.cs b/src/PepperDash.Essentials.Core/Room/EssentialsRoomBase.cs
index cf0aa1f1..abfc34b8 100644
--- a/src/PepperDash.Essentials.Core/Room/EssentialsRoomBase.cs
+++ b/src/PepperDash.Essentials.Core/Room/EssentialsRoomBase.cs
@@ -1,6 +1,4 @@
-extern alias Full;
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -13,8 +11,6 @@ using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Devices;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
-using Full.Newtonsoft.Json;
-
 namespace PepperDash.Essentials.Core
 {
     /// <summary>