more minor conflicts

Signed-off-by: Hardik Kapadia <[email protected]>

Author: hardik-kapadia

src/main/scala/com/distcomp/common/SimulatorActor.scala

@@ -2,7 +2,7 @@ package com.distcomp.common
 
 import akka.actor.typed.{ActorRef, Behavior}
 import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import com.distcomp.common.BrachaMessages.{ActivateNode, EnableBrachaBehaviour, StartProcessing}
+import com.distcomp.common.BrachaMessages.{ActivateNode, StartProcessing}
 import com.distcomp.common.SimulatorProtocol._
 import com.distcomp.common.SpanningTreeProtocol.InitiateSpanningTree
 import com.distcomp.common.MutexProtocol._