diff --git a/src/llmcompressor/modifiers/utils/hooks.py b/src/llmcompressor/modifiers/utils/hooks.py
index ae3a8317c..dc4c4fe16 100644
--- a/src/llmcompressor/modifiers/utils/hooks.py
+++ b/src/llmcompressor/modifiers/utils/hooks.py
@@ -29,17 +29,12 @@ class HooksMixin(BaseModel):
         - modifier.remove_hooks()
     """
 
-<<<<<<< .merge_file_6kKUs9
     # attached to global HooksMixin class
     _HOOKS_DISABLED: ClassVar[bool] = False
     _HOOKS_KEEP_ENABLED: ClassVar[Set[RemovableHandle]] = set()
 
     # attached to local subclasses
     _hooks: Set[RemovableHandle] = set()
-=======
-    _HOOKS_DISABLED: ClassVar[bool] = False  # attached to global HooksMixin
-    _hooks: Set[RemovableHandle] = set()  # attached to local subclasses
->>>>>>> .merge_file_ehHxqS
 
     @classmethod
     @contextlib.contextmanager