diff --git a/reference/checkouts.v3.yml b/reference/checkouts.v3.yml
index 0defd3851..6e21c8414 100644
--- a/reference/checkouts.v3.yml
+++ b/reference/checkouts.v3.yml
@@ -1608,14 +1608,10 @@ paths:
 
         This discount only applies to `line_items`. When you call this API, you clear out all existing discounts applied to line items, including product and order-based discounts.
 
-<<<<<<< HEAD
-        This endpoint splits the discount between line items based on the item value.
-=======
         **Note:**
         This endpoint splits the discount between line items based on the item value. 
 
         You'll get an error message if you try adding a manual line item discount on a cart with a promotion or coupon applied. The same limitations apply if you try adding a coupon or promotion to a cart with an existing manual line item discount.
->>>>>>> 07c51731 (Update reference/checkouts.v3.yml)
 
         Required Fields
         * discounted_amount