diff --git a/erpnext/stock/doctype/warehouse/warehouse.json b/erpnext/stock/doctype/warehouse/warehouse.json
index d9f591ac3f8..f2d157b0ae4 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.json
+++ b/erpnext/stock/doctype/warehouse/warehouse.json
@@ -263,11 +263,7 @@
  "idx": 1,
  "is_tree": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-01-24 16:27:28.299520",
-=======
  "modified": "2024-08-14 16:08:15.733597",
->>>>>>> c1812f74e8 (fix: disable rename from warehouse)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Warehouse",