diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index f6b6b31..b092037 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -1609,7 +1609,6 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
-<<<<<<< HEAD
    "collapsible": 1, 
    "fieldname": "column_break5", 
    "fieldtype": "Section Break", 
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index ec7dd5e..2a0a50d 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
  "allow_copy": 0,
  "allow_import": 1,
  "allow_rename": 1,
@@ -12,7 +11,6 @@
  "document_type": "Setup",
  "fields": [
   {
-<<<<<<< HEAD
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
@@ -33,32 +31,9 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
-=======
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "basic_info", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "", 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-user", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
->>>>>>> Added Tax Rule under ERPNext > Accounts > Setup
    "unique": 0
   },
   {
-<<<<<<< HEAD
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
@@ -80,33 +55,9 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
-=======
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "naming_series", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Series", 
-   "no_copy": 1, 
-   "oldfieldname": "naming_series", 
-   "oldfieldtype": "Select", 
-   "options": "SUPP-", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
->>>>>>> Added Tax Rule under ERPNext > Accounts > Setup
    "unique": 0
   },
   {
-<<<<<<< HEAD
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
@@ -127,32 +78,9 @@
    "reqd": 1,
    "search_index": 0,
    "set_only_once": 0,
-=======
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "supplier_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Supplier Name", 
-   "no_copy": 1, 
-   "oldfieldname": "supplier_name", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
->>>>>>> Added Tax Rule under ERPNext > Accounts > Setup
    "unique": 0
   },
   {
-<<<<<<< HEAD
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
@@ -171,30 +99,9 @@
    "search_index": 0,
    "set_only_once": 0,
    "unique": 0,
-=======
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break0", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
->>>>>>> Added Tax Rule under ERPNext > Accounts > Setup
    "width": "50%"
   },
   {
-<<<<<<< HEAD
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
@@ -216,33 +123,9 @@
    "reqd": 1,
    "search_index": 0,
    "set_only_once": 0,
-=======
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "supplier_type", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Supplier Type", 
-   "no_copy": 0, 
-   "oldfieldname": "supplier_type", 
-   "oldfieldtype": "Link", 
-   "options": "Supplier Type", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
->>>>>>> Added Tax Rule under ERPNext > Accounts > Setup
    "unique": 0
   },
   {
-<<<<<<< HEAD
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
@@ -262,31 +145,9 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
-=======
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "is_frozen", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Is Frozen", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
->>>>>>> Added Tax Rule under ERPNext > Accounts > Setup
    "unique": 0
   },
   {
-<<<<<<< HEAD
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
@@ -305,33 +166,9 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
-=======
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:!doc.__islocal", 
-   "fieldname": "address_contacts", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Address & Contacts", 
-   "no_copy": 0, 
-   "oldfieldtype": "Column Break", 
-   "options": "icon-map-marker", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
->>>>>>> Added Tax Rule under ERPNext > Accounts > Setup
    "unique": 0
   },
   {
-<<<<<<< HEAD
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
@@ -351,30 +188,9 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
-=======
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "address_html", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Address HTML", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
->>>>>>> Added Tax Rule under ERPNext > Accounts > Setup
    "unique": 0
   },
   {
-<<<<<<< HEAD
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
@@ -437,51 +253,9 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
-=======
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break1", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "50%"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "contact_html", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Contact HTML", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
->>>>>>> Added Tax Rule under ERPNext > Accounts > Setup
    "unique": 0
   },
   {
-<<<<<<< HEAD
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
@@ -500,30 +274,9 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
-=======
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "default_payable_accounts", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Default Payable Accounts", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
->>>>>>> Added Tax Rule under ERPNext > Accounts > Setup
    "unique": 0
   },
   {
-<<<<<<< HEAD
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
@@ -545,29 +298,6 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
-=======
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:!doc.__islocal", 
-   "description": "Mention if non-standard receivable account applicable", 
-   "fieldname": "accounts", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Accounts", 
-   "no_copy": 0, 
-   "options": "Party Account", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
->>>>>>> Added Tax Rule under ERPNext > Accounts > Setup
    "unique": 0
   },
   {