diff --git a/src/main/java/org/egothor/stemmer/FrequencyTrie.java b/src/main/java/org/egothor/stemmer/FrequencyTrie.java
index 7d433fe..9c1cae4 100644
--- a/src/main/java/org/egothor/stemmer/FrequencyTrie.java
+++ b/src/main/java/org/egothor/stemmer/FrequencyTrie.java
@@ -529,16 +529,10 @@ public final class FrequencyTrie<V> {
      * Returns the deterministic SHA-256 fingerprint of this trie.
      *
      * <p>
-     * <<<<<<< HEAD The fingerprint is a canonical model identity, not a Java object
-     * identity. It includes a fingerprint-domain marker, the fingerprint input
-     * format version, persisted metadata, and the complete compiled-node structure
-     * reachable from the root, including edges, child references, local values, and
-     * local counts. ======= The fingerprint is a canonical model identity, not a
-     * Java object identity. It includes a fingerprint-domain marker, the
-     * fingerprint input format version, persisted metadata, and the complete
-     * compiled-node structure reachable from the root, including edges, child
-     * references, local values, and local counts. >>>>>>>
-     * 464b5804366e8d7034a819f891f5cd730ad8c005
+     * The fingerprint is a canonical model identity, not a Java object identity. It
+     * includes a fingerprint-domain marker, the fingerprint input format version,
+     * persisted metadata, and the complete compiled-node structure reachable from
+     * the root, including edges, child references, local values, and local counts.
      * </p>
      *
      * <p>