diff --git a/erpnext/stock/doctype/pick_list/pick_list.json b/erpnext/stock/doctype/pick_list/pick_list.json
index 927d1a61edc..0e466e44d1b 100644
--- a/erpnext/stock/doctype/pick_list/pick_list.json
+++ b/erpnext/stock/doctype/pick_list/pick_list.json
@@ -204,11 +204,7 @@
  ],
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-02-02 16:17:44.877426",
-=======
  "modified": "2024-03-27 22:49:16.954637",
->>>>>>> 50dd9fa8a3 (feat: allow to pick manually qty / batches / serial nos)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Pick List",