diff --git a/Voron Mods/Voron 2-Trident/2.4/Voron2.4_Trident_Pins_Mod/README.md b/Voron Mods/Voron 2-Trident/2.4/Voron2.4_Trident_Pins_Mod/README.md
index 96a6f86..bd33521 100644
--- a/Voron Mods/Voron 2-Trident/2.4/Voron2.4_Trident_Pins_Mod/README.md	
+++ b/Voron Mods/Voron 2-Trident/2.4/Voron2.4_Trident_Pins_Mod/README.md	
@@ -1,5 +1,3 @@
-
-
 ## This has been updated for V2.4r2 and Trident 
 
 This mod is for the V2/Trident, it involves printing new AB drive frames, new XY Joints, new Front Tensioners, and new Z idlers
@@ -20,17 +18,10 @@ To complete this mod the following files will need to be reprinted
 - [a]_b_tensioner_pinned.stl
 
 **XY Joints**
-<<<<<<< Updated upstream:printer_mods/hartk1213/Voron2.4_Trident_Pins_Mod/README.md
-- MGN12_xy_joint_left_upper_pinned.stl
-- MGN12_xy_joint_left_lower_pinned.stl
-- MGN12_xy_joint_right_upper_pinned.stl
-- MGN12_xy_joint_right_lower_pinned.stl
-=======
 - xy_joint_left_upper_pinned.stl
 - xy_joint_left_lower_pinned.stl
 - xy_joint_right_upper_pinned.stl
 - xy_joint_right_lower_pinned.stl
->>>>>>> Stashed changes:printer_mods/hartk1213/Voron2.4_Pins_Mod/README.md
 
 **Z Idlers FOR V2**
 either one of these based on if you are using 6mm or 9mm belt
@@ -39,11 +30,8 @@ either one of these based on if you are using 6mm or 9mm belt
 
 here is what the XY Joint will look like
 
-<<<<<<< Updated upstream:printer_mods/hartk1213/Voron2.4_Trident_Pins_Mod/README.md
 ![XY Joint](Images/1.jpg)
 ![XY Joint](Images/2.jpg)
-=======
-![XY Joint](Images/1.png) 
 
 
 There is a new file for the A Drive to go along with [Arkeets MGN12](https://github.com/VoronDesign/VoronUsers/tree/master/printer_mods/arkeet/mgn12) mod that has the X endstop on the toolhead 
@@ -66,11 +54,6 @@ you might need to bend the pins a little bit to get them to fit around the curve
 ![JST with bent pins](Images/ADrive/4.png)
 
 
-
-
-
->>>>>>> Stashed changes:printer_mods/hartk1213/Voron2.4_Pins_Mod/README.md
-
 here is what the Z idler will look like
 ![XY Joint](Images/z.jpg)