diff --git a/src/config.rs b/src/config.rs
index fb0c60e..c604a19 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1301,7 +1301,6 @@ super + {a-}
     {firefox, brave}";
         eval_invalid_config_test(contents, ParseError::UnknownSymbol(2))
     }
-<<<<<<< HEAD
 
     #[test]
     fn test_alias() -> std::io::Result<()> {