diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index d579669..3542c9e 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -307,31 +307,18 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-<<<<<<< HEAD
    "fieldname": "credit_days_based_on", 
    "fieldtype": "Select", 
-=======
-   "depends_on": "eval:doc.credit_days_based_on == 'Fixed Days'", 
-   "fieldname": "credit_days", 
-   "fieldtype": "Int", 
->>>>>>> ff321763cf11f306460db22789e31756121dbe67
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-<<<<<<< HEAD
    "label": "Credit Days Based On", 
    "length": 0, 
    "no_copy": 0, 
    "options": "\nFixed Days\nLast Day of the Next Month", 
    "permlevel": 0, 
    "precision": "", 
-=======
-   "label": "Credit Days", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
->>>>>>> ff321763cf11f306460db22789e31756121dbe67
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
@@ -345,30 +332,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-<<<<<<< HEAD
    "depends_on": "eval:doc.credit_days_based_on == 'Fixed Days'", 
    "fieldname": "credit_days", 
    "fieldtype": "Int", 
-=======
-   "depends_on": "eval:!doc.__islocal", 
-   "fieldname": "address_contacts", 
-   "fieldtype": "Section Break", 
->>>>>>> ff321763cf11f306460db22789e31756121dbe67
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-<<<<<<< HEAD
    "label": "Credit Days", 
    "length": 0, 
    "no_copy": 0, 
-=======
-   "label": "Address and Contacts", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Column Break", 
-   "options": "icon-map-marker", 
->>>>>>> ff321763cf11f306460db22789e31756121dbe67
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -383,7 +356,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-<<<<<<< HEAD
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "address_contacts", 
    "fieldtype": "Section Break", 
@@ -410,8 +382,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-=======
->>>>>>> ff321763cf11f306460db22789e31756121dbe67
    "fieldname": "address_html", 
    "fieldtype": "HTML", 
    "hidden": 0, 
@@ -638,11 +608,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
-<<<<<<< HEAD
  "modified": "2016-02-22 16:50:55.710869", 
-=======
- "modified": "2016-02-17 12:28:05.386806", 
->>>>>>> ff321763cf11f306460db22789e31756121dbe67
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier",