diff --git a/data/parameter_corrections.yaml b/data/parameter_corrections.yaml
index d16d5d24..b50fc03a 100644
--- a/data/parameter_corrections.yaml
+++ b/data/parameter_corrections.yaml
@@ -38,22 +38,6 @@ Link:
       "T23": "6355" # bus0 == bus1 to remove link in remove_unconnected_components (NordBalt)
   bus1:
     index:
-<<<<<<< HEAD
-      "11511": "6240" # fix wrong bus allocation from 6241
-      "14559": "6240" # fix wrong bus allocation from 6241
-      "12998": "1333" # combine link 12998 + 12997 in 12998
-      "5627": '2309' # combine link 5627 + 5628 in 5627
-      "8068": "5819" # fix GB location of Anglo-Scottish interconnector
-  length:
-    index:
-      "12998": 409.0
-      "5627": 26.39
-  bus0:
-    index:
-      "14552": "5819" # fix GB location of GB-IE interconnector
-      "5628": "7276" # bus0 == bus1 to remove link in remove_unconnected_components
-      "12997": "7276" # bus0 == bus1 to remove link in remove_unconnected_components
-=======
       "12931": "8152" # BorWin3
       "5582": "2382" # combine link 5583 + 5582 in 5582 (Sardinia)
       "13589": "1349" # combine link 13589 + 13588 in 13589 (Sardinia)
@@ -72,4 +56,3 @@ Line:
   v_nom:
     index:
       "14573": 220 # 220/380kV issue of substation in PT
->>>>>>> master