diff --git a/SecuritySystemContracts/SearchModels/SecureSearchModel.cs b/SecuritySystemContracts/SearchModels/SecureSearchModel.cs
index 1778cfb..8547e9f 100644
--- a/SecuritySystemContracts/SearchModels/SecureSearchModel.cs
+++ b/SecuritySystemContracts/SearchModels/SecureSearchModel.cs
@@ -6,16 +6,10 @@ using System.Threading.Tasks;
 
 namespace SecuritySystemContracts.SearchModels
 {
-<<<<<<< HEAD:SecuritySystemContracts/SearchModels/ComponentSearchModel.cs
-    public class ComponentSearchModel
-    {
-        public int? Id { get; set; }
-        public string? ComponentName { get; set; }
-=======
     public class SecureSearchModel
     {
         public int? Id { get; set; }
         public string? SecureName { get; set; }
->>>>>>> Rename:SecuritySystemContracts/SearchModels/SecureSearchModel.cs
+
     }
 }