diff --git a/src/go/pt-galera-log-explainer/types/ctx.go b/src/go/pt-galera-log-explainer/types/ctx.go
index 5042161e..f42ea7fd 100644
--- a/src/go/pt-galera-log-explainer/types/ctx.go
+++ b/src/go/pt-galera-log-explainer/types/ctx.go
@@ -230,6 +230,7 @@ func (base *LogCtx) Inherit(ctx LogCtx) {
 	if base.Version == "" {
 		base.Version = ctx.Version
 	}
+	base.Conflicts = append(ctx.Conflicts, base.Conflicts...)
 	base.MergeMapsWith([]LogCtx{ctx})
 }