Fix readmarker breaking merge

gajim/gtk/conversation/view.py

@@ -236,6 +236,9 @@ def _find_ancestor(self, message):
             if row is None:
                 return None
 
+            if row.type == 'read_marker':
+                continue
+
             if row.type != 'chat':
                 return None
 
@@ -254,6 +257,9 @@ def _update_descendants(self, message):
             if row is None:
                 return
 
+            if row.type == 'read_marker':
+                continue
+
             if row.type != 'chat':
                 return