diff --git a/features/steps/utils/geometry.py b/features/steps/utils/geometry.py
index 960160d2..87b5b9a1 100644
--- a/features/steps/utils/geometry.py
+++ b/features/steps/utils/geometry.py
@@ -1,11 +1,7 @@
 from dataclasses import dataclass
 import operator
 import math
-<<<<<<< HEAD
-from typing import Dict, Optional
-=======
-from typing import Dict, Tuple
->>>>>>> development
+from typing import Dict, Optional, Tuple
 
 import numpy as np
 import mpmath as mp