diff --git a/Pepperdash Core/Pepperdash Core.suo b/Pepperdash Core/Pepperdash Core.suo
index 6d73571..0de33ea 100644
Binary files a/Pepperdash Core/Pepperdash Core.suo and b/Pepperdash Core/Pepperdash Core.suo differ
diff --git a/Pepperdash Core/Pepperdash Core.suo.orig b/Pepperdash Core/Pepperdash Core.suo.orig
new file mode 100644
index 0000000..6d73571
Binary files /dev/null and b/Pepperdash Core/Pepperdash Core.suo.orig differ
diff --git a/Pepperdash Core/Pepperdash Core/Comm/eControlMethods.cs b/Pepperdash Core/Pepperdash Core/Comm/eControlMethods.cs
index 122578d..d320366 100644
--- a/Pepperdash Core/Pepperdash Core/Comm/eControlMethods.cs	
+++ b/Pepperdash Core/Pepperdash Core/Comm/eControlMethods.cs	
@@ -8,6 +8,6 @@ namespace PepperDash.Core
 {
     public enum eControlMethod
     {
-        None = 0, Com, IpId, IR, Ssh, Tcpip, Telnet, Cresnet
+        None = 0, Com, IpId, IpidTcp, IR, Ssh, Tcpip, Telnet, Cresnet
     }
 }
\ No newline at end of file
diff --git a/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs b/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs
index 010930c..5be34b2 100644
--- a/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs	
+++ b/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs	
@@ -4,4 +4,4 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Pepperdash_Core")]
 [assembly: AssemblyCopyright("Copyright © PepperDash 2016")]
-[assembly: AssemblyVersion("1.0.3.*")]
+[assembly: AssemblyVersion("1.0.4.*")]
diff --git a/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs.orig b/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs.orig
new file mode 100644
index 0000000..4d15192
--- /dev/null
+++ b/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs.orig	
@@ -0,0 +1,11 @@
+using System.Reflection;
+
+[assembly: AssemblyTitle("Pepperdash_Core")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Pepperdash_Core")]
+[assembly: AssemblyCopyright("Copyright © PepperDash 2016")]
+<<<<<<< HEAD
+[assembly: AssemblyVersion("1.0.2.*")]
+=======
+[assembly: AssemblyVersion("1.0.3.*")]
+>>>>>>> e16c2cbee87c631bf84ad9634bfbc25bbec78a31