diff --git a/README.org b/README.org
index af2441a..db73e86 100644
--- a/README.org
+++ b/README.org
@@ -336,7 +336,12 @@ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
 *** All Filters
 #+begin_src txt :noweb yes :tangle chase-all.txt
+<<<<<<< HEAD
 ! Title: chase's uBlock Filter Collection
+=======
+[uBlock Origin]
+! Title: All Filters
+>>>>>>> d66b77d (Test linguist)
 ! Description: All filters provided by chase's filter repo
 <<header>>
 
diff --git a/chase-all.txt b/chase-all.txt
index 16bc0c8..176d43e 100644
--- a/chase-all.txt
+++ b/chase-all.txt
@@ -1,4 +1,9 @@
+<<<<<<< HEAD
 ! Title: chase's uBlock Filter Collection
+=======
+[uBlock Origin]
+! Title: All Filters
+>>>>>>> d66b77d (Test linguist)
 ! Description: All filters provided by chase's filter repo
 ! Version: 2.6.0
 ! Last modified: 2025-08-17