diff --git a/.gitattributes b/.gitattributes
index f891ee52edf6148d4b455bf1fdef96d977417553..03429f43957413b6c7509b3277f171a357f79259 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -241,12 +241,9 @@ data/AB/1993/03_correctedmeta.tar.gz filter=lfs diff=lfs merge=lfs -text
 data/AB/1994/03_correctedmeta.tar.gz filter=lfs diff=lfs merge=lfs -text
 data/AB/1995/03_correctedmeta.tar.gz filter=lfs diff=lfs merge=lfs -text
 data/AB/1973/04_correctedxml.tar.gz filter=lfs diff=lfs merge=lfs -text
-<<<<<<< HEAD
 data/AB/1975/02_extractedxml.tar.gz filter=lfs diff=lfs merge=lfs -text
 data/AB/1976/02_extractedxml.tar.gz filter=lfs diff=lfs merge=lfs -text
-=======
 data/AB/1974/04_correctedxml.tar.gz filter=lfs diff=lfs merge=lfs -text
 data/AB/1980/02_extractedxml.tar.gz filter=lfs diff=lfs merge=lfs -text
 data/AB/1981/02_extractedxml.tar.gz filter=lfs diff=lfs merge=lfs -text
->>>>>>> e664070b2412ace18c8f5adafe5e0cf57e0ffce8
 data/AB/1977/02_extractedxml.tar.gz filter=lfs diff=lfs merge=lfs -text