weee have I messed something up or what

data/Station.csv

@@ -253,12 +253,9 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'ANDULIGA','Celsius Estate',0,'?','?'
 'ANEK WANG','Henize Hub',0,'?','?'
 'ANEMOI','Abasheli Point',0,'?','?'
-<<<<<<< HEAD
-=======
 'ANGI','Georg Bothe Beacon',0,'?','M'
 'ANGI','Khan Port',96.4,'N','M'
 'ANINOHINI','Griffith Orbital',0,'Y','L'
->>>>>>> 20c0505f0af40cc8ff50f1eb6a22573f486f2c0d
 'ANLAVE','Bain Dock',3279,'N','M'
 'ANLAVE','Brunton Gateway',73,'N','M'
 'ANLAVE','Hogg City',1075,'N','L'
@@ -483,9 +480,7 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'BD+55 1519','Arber Colony',0,'Y','M'
 'BD+55 1519','Eskridge Orbital',0,'?','?'
 'BD+55 1519','Schirra Port',856,'Y','M'
-<<<<<<< HEAD
 'BD+65 1846','Shargin Beacon',0,'?','?'
-=======
 'BD+57 2595','Conklin Station',0,'N','L'
 'BD+57 2595','Smith Enterprise',0,'N','L'
 'BD+63 1764','Alpers Ring',0,'Y','L'
@@ -500,7 +495,6 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'BD+65 1846','Thiele Hub',27,'N','L'
 'BD+65 210','Belyayev Gateway',321,'N','L'
 'BD+65 210','Stefanyshyn-Piper Port',190,'Y','L'
->>>>>>> 20c0505f0af40cc8ff50f1eb6a22573f486f2c0d
 'BD+65 626','Chalker Dock',8555,'Y','M'
 'BD+71 1033','Fourneyron Port',0,'?','?'
 'BD+74 526','Smith Prospect',0,'?','?'
@@ -1373,9 +1367,7 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'HIP 41181','Garcia Port',0,'?','L'
 'HIP 41955','Lukyanenko Platform',23,'Y','M'
 'HIP 41955','Nixon Landing',23,'N','M'
-<<<<<<< HEAD
 'HIP 4907','Edison Platform',0,'?','?'
-=======
 'HIP 43670','Aldiss Ring',32694,'?','L'
 'HIP 43670','Emshwiller Station',32735,'?','M'
 'HIP 43670','Holden Dock',32789,'?','M'
@@ -1389,7 +1381,6 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'HIP 44387','Priestley Orbital',1235,'?','L'
 'HIP 44387','Thagard Port',2310,'?','M'
 'HIP 4907','Macgregor City',2370,'N','L'
->>>>>>> 20c0505f0af40cc8ff50f1eb6a22573f486f2c0d
 'HIP 59533','Burnham Beacon',0,'?','L'
 'HIP 60679','Cady Enterprise',2455,'Y','L'
 'HIP 62536','Onnes Orbital',0,'?','?'
@@ -3647,13 +3638,8 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'YAX BALAM','Ivanchenkov Plant',0,'?','?'
 'YAX BALAM','Kendrick Holdings',0,'?','?'
 'YE''KUAPEMAS','Hawke''s Progress',0,'?','?'
-<<<<<<< HEAD
-'YEMAIA','Hartog Relay',0,'?','?'
-'YEMBO','Naddoddur Terminal',0,'?','?'
-=======
 'YEMAIA','Hartog Relay',0,'N','M'
 'YEMBO','Naddoddur Terminal',1009,'N','?'
->>>>>>> 20c0505f0af40cc8ff50f1eb6a22573f486f2c0d
 'YEN DI','Brown Dock',0,'?','?'
 'YEN K''UIE','Siddha Gateway',1099,'?','L'
 'YGGDRAJANG','Schade Platform',0,'?','?'