fixed bad conflict resolutions

Signed-off-by: Max Chesterfield <max.chesterfield@zepben.com>

Author: chestm007

changelog.md

@@ -27,7 +27,6 @@
 * You can now pass a logger to all `Tracing` methods and `TestNetworkBuilder.build` to enable debug logging for the traces it runs. The debug logging will
   include the results of all queue and stop condition checks, and each item that is stepped on.
 
-
 ### Enhancements
 * Tracing models with `Cut` and `Clamp` are now supported via the new tracing API.
 * Added support to `TestNetworkBuilder` for:
@@ -42,7 +41,6 @@
   a follow-up trace from a detected stop point.
 * `Traversal.is_stopping`/`Traversal.is_not_stopping` now accept `StepAction` and any child classes, including those subclassing `StepActionWithContextValue`
 
-
 ### Fixes
 * When finding `LvFeeders` in the `Site` we will now exclude `LvFeeders` that start with an open `Switch`
 * `AssignToFeeder` and `AssignToLvFeeder` will no longer trace from start terminals that belong to open switches

src/zepben/evolve/services/network/tracing/networktrace/network_trace_step.py

@@ -6,7 +6,7 @@
 
 from dataclasses import dataclass, field
 from enum import Enum
-from typing import Set, Generic, TypeVar, TYPE_CHECKING, Optional, List, FrozenSet
+from typing import Set, Generic, TypeVar, TYPE_CHECKING, Optional, FrozenSet
 
 from zepben.evolve.services.network.tracing.connectivity.nominal_phase_path import NominalPhasePath