chore: fix merge conflict

erpnext/setup/doctype/company/company.json

@@ -698,40 +698,6 @@
    "label": "Default Provisional Account",
    "no_copy": 1,
    "options": "Account"
-<<<<<<< HEAD
-=======
-  },
-  {
-   "fieldname": "advance_payments_section",
-   "fieldtype": "Section Break",
-   "label": "Advance Payments"
-  },
-  {
-   "depends_on": "eval:doc.book_advance_payments_in_separate_party_account",
-   "fieldname": "default_advance_received_account",
-   "fieldtype": "Link",
-   "label": "Default Advance Received Account",
-   "mandatory_depends_on": "book_advance_payments_as_liability",
-   "options": "Account"
-  },
-  {
-   "depends_on": "eval:doc.book_advance_payments_in_separate_party_account",
-   "fieldname": "default_advance_paid_account",
-   "fieldtype": "Link",
-   "label": "Default Advance Paid Account",
-   "mandatory_depends_on": "book_advance_payments_as_liability",
-   "options": "Account"
-  },
-  {
-   "fieldname": "column_break_fwcf",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0",
-   "description": "Enabling this option will allow you to record - <br><br> 1. Advances Received in a <b>Liability Account</b> instead of the <b>Asset Account</b><br><br>2. Advances Paid in an <b>Asset Account</b> instead of the <b> Liability Account</b>",
-   "fieldname": "book_advance_payments_in_separate_party_account",
-   "fieldtype": "Check",
-   "label": "Book Advance Payments in Separate Party Account"
   },
   {
    "fieldname": "exchange_rate_revaluation_settings_section",
@@ -749,16 +715,12 @@
    "fieldtype": "Select",
    "label": "Frequency",
    "options": "Daily\nWeekly"
-<<<<<<< HEAD
->>>>>>> 6644311c8b (refactor: checkbox for enabling auto ERR creation)
-=======
   },
   {
    "default": "0",
    "fieldname": "submit_err_jv",
    "fieldtype": "Check",
    "label": "Submit ERR Journals?"
->>>>>>> 4f51c5a433 (refactor: submit and make JV through background job)
   }
  ],
  "icon": "fa fa-building",
@@ -766,15 +728,7 @@
  "image_field": "company_logo",
  "is_tree": 1,
  "links": [],
-<<<<<<< HEAD
-<<<<<<< HEAD
- "modified": "2022-08-16 16:09:02.327724",
-=======
- "modified": "2023-07-03 14:29:56.262188",
->>>>>>> 6644311c8b (refactor: checkbox for enabling auto ERR creation)
-=======
  "modified": "2023-07-07 05:41:41.537256",
->>>>>>> 4f51c5a433 (refactor: submit and make JV through background job)
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Company",
@@ -837,4 +791,4 @@
  "sort_order": "ASC",
  "states": [],
  "track_changes": 1
-}
+}