diff --git a/battery/battery_cell.py b/battery/battery_cell.py
index 5be21b1..c3d5cb5 100644
--- a/battery/battery_cell.py
+++ b/battery/battery_cell.py
@@ -1,9 +1,6 @@
 from __future__ import annotations
 
-<<<<<<< HEAD
-=======
 from hal import get_interval
->>>>>>> 763c272 (Add hysteresis on detecting over voltage errors)
 from .constants import OVER_VOLTAGE, UNDER_VOLTAGE
 from typing import TYPE_CHECKING, List
 if TYPE_CHECKING:
diff --git a/test/bms/test_Bms.py b/test/bms/test_Bms.py
index bca8d76..1e53cc5 100644
--- a/test/bms/test_Bms.py
+++ b/test/bms/test_Bms.py
@@ -1,6 +1,6 @@
 import unittest
 from battery.battery_pack import BatteryPack  # type: ignore
-from bms import Config
+from config import Config
 from bms.bms import Bms
 from bms.current_sensor.current_sensor import CurrentSensor