diff --git a/.gitattributes b/.gitattributes
index 577ca155..d4d2d2bb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -69,10 +69,7 @@ tests/SelectedSaclFixtureProtection.cs text eol=lf
 /scripts/WecRuntime* text eol=lf
 /tests/WecState* text eol=lf
 
-<<<<<<< HEAD
 /scripts/WecListener* text eol=lf
-=======
 # Existing-file read receipts bind identical native/worker source bytes.
 /scripts/FileAccessProbe* text eol=lf
 /tests/FileAccessProbe* text eol=lf
->>>>>>> feat/373-native-file-access-probe