diff --git a/unicodetools/src/main/java/org/unicode/jsp/FileUtilities.java b/unicodetools/src/main/java/org/unicode/jsp/FileUtilities.java
index 366627e50..7b8028da0 100644
--- a/unicodetools/src/main/java/org/unicode/jsp/FileUtilities.java
+++ b/unicodetools/src/main/java/org/unicode/jsp/FileUtilities.java
@@ -76,6 +76,12 @@ public SemiFileReader process(BufferedReader in, String fileName) {
                     if (line == null) {
                         break;
                     }
+                    // Ignore merge conflict markers.
+                    if (line.startsWith("<<<<<<<")
+                            || line.startsWith("=======")
+                            || line.startsWith(">>>>>>>")) {
+                        continue;
+                    }
                     final int comment = line.indexOf("#");
                     if (comment >= 0) {
                         processComment(line, comment);