diff --git a/ParameterData/MaterialProperties/OrganicLiPF6Solutions/orgLiPF6_Xu.json b/ParameterData/MaterialProperties/OrganicLiPF6Solutions/orgLiPF6_Xu.json
index ca707ba3..4567913d 100644
--- a/ParameterData/MaterialProperties/OrganicLiPF6Solutions/orgLiPF6_Xu.json
+++ b/ParameterData/MaterialProperties/OrganicLiPF6Solutions/orgLiPF6_Xu.json
@@ -2,38 +2,30 @@
   "specificHeatCapacity": 1518.0,
   "thermalConductivity": 0.099,
   "density": 1210,
-  "initialConcentration": {"value" : 1,
-                           "unit" : "mol/litre"},
-  "Conductivity" : {"type": "function",
-                    "functionname" : "computeElectrolyteConductivityFunc_Xu",
-                    "argumentlist" : ["concentration", "temperature"]
-                   },
-  "DiffusionCoefficient" : {"type": "function",
-                            "functionname" : "computeDiffusionCoefficientFunc_Xu",
-                            "argumentlist" : ["concentration", "temperature"]
-                           },
-<<<<<<< HEAD:ParameterData/MaterialProperties/OrganicLiPF6Solutions/orgLiPF6_Lin.json
-  "species": { "chargeNumber": 1,
-               "transferenceNumber": 0.2594,
-               "nominalConcentration": 1000},
-  "Separator": { "filename": "ParameterData/BatteryComponentParameters/celgard2500_Lin.json",
-||||||| ece1269c (Change from Xu to Lin and make it compatible with updates from refactoring):ParameterData/MaterialProperties/OrganicLiPF6Solutions/orgLiPF6_Lin.json
-  "compnames": [
-    "Li",
-    "PF6"
-  ],
-  "sp": { "z": 1,
-          "t": 0.2594},
-  "Separator": { "filename": "ParameterData/BatteryComponentParameters/celgard2500_Lin.json",
-=======
-  "compnames": [
-    "Li",
-    "PF6"
-  ],
-  "sp": { "z": 1,
-          "t": 0.2594},
-  "Separator": { "filename": "ParameterData/BatteryComponentParameters/celgard2500_Xu.json",
->>>>>>> parent of ece1269c (Change from Xu to Lin and make it compatible with updates from refactoring):ParameterData/MaterialProperties/OrganicLiPF6Solutions/orgLiPF6_Xu.json
-                 "isFile": true },
+  "initialConcentration": {
+    "value": 1,
+    "unit": "mol/litre"
+  },
+  "Conductivity": {
+    "type": "function",
+    "functionname": "computeElectrolyteConductivityFunc_Xu",
+    "argumentlist": [
+      "concentration",
+      "temperature"
+    ]
+  },
+  "DiffusionCoefficient": {
+    "type": "function",
+    "functionname": "computeDiffusionCoefficientFunc_Xu",
+    "argumentlist": [
+      "concentration",
+      "temperature"
+    ]
+  },
+  "species": {
+    "chargeNumber": 1,
+    "transferenceNumber": 0.2594,
+    "nominalConcentration": 1000
+  },
   "BruggemanCoefficient": 1.5
 }
diff --git a/ParameterData/ParameterSets/Xu2015/lfp.json b/ParameterData/ParameterSets/Xu2015/lfp.json
index bc259cb3..607ab86b 100644
--- a/ParameterData/ParameterSets/Xu2015/lfp.json
+++ b/ParameterData/ParameterSets/Xu2015/lfp.json
@@ -5,33 +5,33 @@
   "initT": 293.15,
   "use_thermal": true,
   "include_current_collectors": true,
-  "Control" : {
-    "controlPolicy" : "CCDischarge",
-    "DRate" : 1,
-    "lowerCutoffVoltage" : 2,
-    "upperCutoffVoltage" : 4.1,
-    "dIdtLimit" : 0.01,
-    "dEdtLimit" : 0.01
+  "Control": {
+    "controlPolicy": "CCDischarge",
+    "DRate": 1,
+    "lowerCutoffVoltage": 2,
+    "upperCutoffVoltage": 4.1,
+    "dIdtLimit": 0.01,
+    "dEdtLimit": 0.01
   },
   "NegativeElectrode": {
     "Coating": {
       "BruggemanCoefficient": 1.5,
       "volumeFraction": 0.7,
       "ActiveMaterial": {
-	"specificHeatCapacity": 1435.0,
-	"thermalConductivity": 1.04,
-	"electricalConductivity": 2,
-	"Interface": {
+        "specificHeatCapacity": 1435.0,
+        "thermalConductivity": 1.04,
+        "electricalConductivity": 2,
+        "Interface": {
           "isFile": true,
           "filename": "ParameterData/MaterialProperties/LiC6/LiC6_Xu.json"
-	},
-	"diffusionModelType" : "full",
-	"SolidDiffusion" : {
+        },
+        "diffusionModelType": "full",
+        "SolidDiffusion": {
           "activationEnergyOfDiffusion": 4000,
           "referenceDiffusionCoefficient": 3.9e-14,
-          "particleRadius": 14.75e-06,
+          "particleRadius": 1.475e-05,
           "N": 10
-	}
+        }
       }
     },
     "CurrentCollector": {
@@ -44,20 +44,20 @@
       "BruggemanCoefficient": 1.5,
       "volumeFraction": 0.72,
       "ActiveMaterial": {
-	"specificHeatCapacity": 1348.0,
-	"thermalConductivity": 1.48,
-	"electricalConductivity": 0.01,
-	"Interface": {
+        "specificHeatCapacity": 1348.0,
+        "thermalConductivity": 1.48,
+        "electricalConductivity": 0.01,
+        "Interface": {
           "isFile": true,
           "filename": "ParameterData/MaterialProperties/LFP/LFP.json"
-	},
-	"diffusionModelType" : "full",
-	"SolidDiffusion": {
+        },
+        "diffusionModelType": "full",
+        "SolidDiffusion": {
           "activationEnergyOfDiffusion": 20000,
           "referenceDiffusionCoefficient": 1.25e-15,
           "particleRadius": 1.15e-06,
           "N": 10
-	}
+        }
       }
     },
     "CurrentCollector": {
@@ -70,8 +70,7 @@
     "isFile": true
   },
   "Separator": {
-    "comment": "Specification of separator not found in reference",
-    "filename": "ParameterData/BatteryComponentParameters/celgard2500.json",
+    "filename": "ParameterData/BatteryComponentParameters/celgard2500_Xu.json",
     "isFile": true
   },
   "ThermalModel": {