diff --git a/unicodetools/src/main/java/org/unicode/props/UcdLineParser.java b/unicodetools/src/main/java/org/unicode/props/UcdLineParser.java
index 712d5e0c0..c17f3c326 100644
--- a/unicodetools/src/main/java/org/unicode/props/UcdLineParser.java
+++ b/unicodetools/src/main/java/org/unicode/props/UcdLineParser.java
@@ -111,6 +111,11 @@ public boolean hasNext() {
                         return false;
                     }
                     line = line2 = rawLines.next();
+                    if (line.startsWith("<<<<<<<")
+                            || line.startsWith("=======")
+                            || line.startsWith(">>>>>>>")) {
+                        line2 = "";
+                    }
                     ++stats.lineCount;
                     final int hashPos = line2.indexOf('#');
                     if (hashPos >= 0) {