diff --git a/NewHorizons/Builder/Props/DetailBuilder.cs b/NewHorizons/Builder/Props/DetailBuilder.cs
index f21c5fd4..44e88666 100644
--- a/NewHorizons/Builder/Props/DetailBuilder.cs
+++ b/NewHorizons/Builder/Props/DetailBuilder.cs
@@ -227,5 +227,4 @@ namespace NewHorizons.Builder.Props
             return prop;
         }
     }
-}
->>>>>>> dev
+}
\ No newline at end of file