diff --git a/1.6/Defs/HediffDefs/Implants_RegenerateBackstory.xml b/1.6/Defs/HediffDefs/Implants_RegenerateBackstory.xml
index cacf5ea3..87893fd3 100644
--- a/1.6/Defs/HediffDefs/Implants_RegenerateBackstory.xml
+++ b/1.6/Defs/HediffDefs/Implants_RegenerateBackstory.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 
-<<<<<<< Updated upstream
   <ThingDef ParentName="BodyPartProstheticMakeableBase">
-=======
-  <ThingDef>
->>>>>>> Stashed changes
     <defName>Wula_BackstoryRegeneratorImplant</defName>
     <label>backstory regenerator</label>
     <thingClass>ThingWithComps</thingClass>