diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 5cf4ad362aa..01baf452942 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -2229,11 +2229,15 @@
    "link_fieldname": "consolidated_invoice"
   }
  ],
+<<<<<<< HEAD
 <<<<<<< HEAD
  "modified": "2025-02-06 15:59:54.636202",
 =======
  "modified": "2021-08-02 18:36:51.978581",
 >>>>>>> b57521a337 (feat: add `total_billing_hours` to Sales Invoice)
+=======
+ "modified": "2021-08-15 18:40:20.445127",
+>>>>>>> 0f2f11cb33 (fix: typo)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice",
@@ -2288,4 +2292,4 @@
  "title_field": "customer_name",
  "track_changes": 1,
  "track_seen": 1
-}
\ No newline at end of file
+}