diff --git a/doc/JSON_INFO.md b/doc/JSON_INFO.md
index 6266208f37610..f1f1e948d268d 100644
--- a/doc/JSON_INFO.md
+++ b/doc/JSON_INFO.md
@@ -2400,10 +2400,7 @@ Armor can be defined like this:
 "type" : "ARMOR",     // Defines this as armor
 ...                   // same entries as above for the generic item.
                       // additional some armor specific entries:
-<<<<<<< Updated upstream
-=======
 "covers" : [ "foot_l", "foot_r" ],  // Where it covers.  Use bodypart_id defined in body_parts.json  Also note that LEG_EITHER ARM_EITHER HAND_EITHER and FOOT_EITHER are allowed.
->>>>>>> Stashed changes
 "warmth" : 10,        //  (Optional, default = 0) How much warmth clothing provides
 "environmental_protection" : 0,  //  (Optional, default = 0) How much environmental protection it affords
 "encumbrance" : 0,    // Base encumbrance (unfitted value)