diff --git a/erpnext/stock/doctype/pick_list/pick_list.json b/erpnext/stock/doctype/pick_list/pick_list.json
index dca107b1b9f..dfa307de490 100644
--- a/erpnext/stock/doctype/pick_list/pick_list.json
+++ b/erpnext/stock/doctype/pick_list/pick_list.json
@@ -127,61 +127,19 @@
    "fieldtype": "Check",
    "label": "Group Same Items",
    "print_hide": 1
-<<<<<<< HEAD
-=======
-  },
-  {
-   "fieldname": "section_break_15",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "scan_barcode",
-   "fieldtype": "Data",
-   "label": "Scan Barcode",
-   "options": "Barcode"
-  },
-  {
-   "fieldname": "column_break_13",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0",
-   "description": "If checked, picked qty won't automatically be fulfilled on submit of pick list.",
-   "fieldname": "scan_mode",
-   "fieldtype": "Check",
-   "label": "Scan Mode"
-  },
-  {
-   "default": "0",
-   "fieldname": "prompt_qty",
-   "fieldtype": "Check",
-   "label": "Prompt Qty"
   },
   {
    "depends_on": "eval:doc.purpose==='Delivery' && doc.customer",
    "fetch_from": "customer.customer_name",
    "fieldname": "customer_name",
    "fieldtype": "Data",
-<<<<<<< HEAD
-   "label": "Customer Name"
->>>>>>> 0a633a212d (fix: display customer name on picking list)
-=======
    "label": "Customer Name",
    "read_only": 1
->>>>>>> 7083b3148b (fix: make customer_name field read only.)
   }
  ],
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
-<<<<<<< HEAD
- "modified": "2022-04-21 07:56:40.646473",
-=======
- "modified": "2022-07-12 13:03:04.442174",
->>>>>>> 0a633a212d (fix: display customer name on picking list)
-=======
  "modified": "2022-07-19 11:03:04.442174",
->>>>>>> 7083b3148b (fix: make customer_name field read only.)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Pick List",