diff --git a/erpnext/stock/doctype/pick_list_item/pick_list_item.json b/erpnext/stock/doctype/pick_list_item/pick_list_item.json
index a96ebfcdee6..97f8b65b20f 100644
--- a/erpnext/stock/doctype/pick_list_item/pick_list_item.json
+++ b/erpnext/stock/doctype/pick_list_item/pick_list_item.json
@@ -191,7 +191,11 @@
  ],
  "istable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2022-04-22 05:27:38.497997",
+=======
+ "modified": "2021-09-28 12:02:16.923056",
+>>>>>>> b91333afdd (fix: set item.qty as mandatory in picklist (#27680))
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Pick List Item",