diff --git a/montepy/errors.py b/montepy/errors.py
index a61b73b3..f0c2464d 100644
--- a/montepy/errors.py
+++ b/montepy/errors.py
@@ -10,8 +10,7 @@ def __init__(self, message):
 
 class MalformedInputError(ValueError):
     """
-    <<<<<<< HEAD
-        Raised when there is an error with the MCNP input not related to the parser.
+    Raised when there is an error with the MCNP input not related to the parser.
     """
 
     def __init__(self, input, message):