diff --git a/Client.Utils/Constants.cs b/Client.Utils/Constants.cs
index 1f05a7a1..bd89531a 100644
--- a/Client.Utils/Constants.cs
+++ b/Client.Utils/Constants.cs
@@ -20,11 +20,7 @@ namespace Client.Utils
         public static String CEF_LOCALES_PATH           = BASE_PATH + "CEF\\Resources\\locales";
         public static String CEF_EXCEPTIONLOG_PATH      = BASE_PATH + "ExceptionLog";
         public static String errorPageFile              = BASE_PATH + "error.pg";
-<<<<<<< HEAD
         public static String JOB_OPENING_PATH           = "C:\\CMS\\ACTIVE\\TMP\\clientTmpJob\\";
-=======
-        public static String JOB_OPENING_PATH           = "C:\\CMS\\Active\\TMP\\clientTmpJob\\";
->>>>>>> feature/Scada
         
         //Config Names
         public const string CONFIG_KEY              = "Config";
@@ -85,5 +81,3 @@ namespace Client.Utils
         public static string[] JOB_EXTENSIONS = { ".job", ".zip" };
     }
 }
-
-        public static String JOB_OPENING_PATH           = "C:\\CMS\\ACTIVE\\TMP\\clientTmpJob\\";
\ No newline at end of file
diff --git a/Step.Database/Controllers/NcToolManagerController.cs b/Step.Database/Controllers/NcToolManagerController.cs
index 468bca95..cccb0f48 100644
--- a/Step.Database/Controllers/NcToolManagerController.cs
+++ b/Step.Database/Controllers/NcToolManagerController.cs
@@ -171,15 +171,10 @@ namespace Step.Database.Controllers
         public DTONcShankModel GetShank(int shankId)
         {
             // Get shank from database
-            DbNcShankModel dbShank = dbCtx
-                .Shanks
-                .Where(x => x.ShankId == shankId)
-                .Include("Tools")
+            DTONcShankModel dtoShanks = GetShanksWithSpace()
+                .Where(x => x.Id == shankId)
                 .FirstOrDefault();
 
-            // Convert into DTOModel
-            DTONcShankModel dtoShanks = (DTONcShankModel)dbShank;
-
             return dtoShanks;
         }