diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 10f507b343..4fb85d1110 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -113,10 +113,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="BASE_AND_GUI_MAC_SRC" hints="files">
     src/mac/utils.cpp
-<<<<<<< files.bkl
-    <!-- src/mac/utilsexc.cpp -->
-=======
->>>>>>> 1.74
 </set>
 
 <set var="BASE_MAC_HDR" hints="files">