Fix conflicts

Author: borisermakof

ide-common/src/main/java/org/digma/intellij/plugin/insights/view/BuildersHolder.java

@@ -17,6 +17,7 @@
 import org.digma.intellij.plugin.model.rest.insights.SpanSlowEndpointsInsight;
 import org.digma.intellij.plugin.model.rest.insights.SpanUsagesInsight;
 import org.digma.intellij.plugin.model.rest.insights.UnmappedInsight;
+import org.digma.intellij.plugin.model.rest.insights.SpanScalingRootCauseInsight;
 import org.digma.intellij.plugin.ui.model.insights.InsightGroupType;
 import org.digma.intellij.plugin.view.EmptyListViewItemBuilder;
 import org.digma.intellij.plugin.view.ListViewItemBuilder;
@@ -57,7 +58,7 @@ private ListViewItemBuilder<? extends CodeObjectInsight> newBuilder(InsightType
             case SpanScaling:
                 return new GroupListViewItemBuilder<SpanScalingInsight>(InsightGroupType.Span, null, SpanScalingInsight::spanName);
             case SpanScalingRootCause:
-                return new GroupListViewItemBuilder<SpanScalingRootCauseInsight>(InsightGroupType.Span, null, spanScalingRootCauseInsight -> spanScalingRootCauseInsight.getSpanInfo().getName());
+                return new GroupListViewItemBuilder<SpanScalingRootCauseInsight>(InsightGroupType.Span, null, SpanScalingRootCauseInsight::spanName);
             case SpanDurationBreakdown:
                 return new GroupListViewItemBuilder<SpanDurationBreakdownInsight>(InsightGroupType.Span, null, SpanDurationBreakdownInsight::spanName);
             case SpanEndpointBottleneck:

model/src/main/kotlin/org/digma/intellij/plugin/model/rest/insights/SpanScalingRootCauseInsight.kt

@@ -31,9 +31,9 @@ constructor(
         override val customStartTime: Date?,
         override val prefixedCodeObjectId: String?,
         override val shortDisplayInfo: ShortDisplayInfo?,
-        val spanInfo: SpanInfo,
+        override val spanInfo: SpanInfo,
         val affectedEndpoints: List<EndpointInfo> = ArrayList()
-) : CodeObjectInsight {
+) : SpanInsight {
 
     override val type: InsightType = InsightType.SpanScalingRootCause
 }