diff --git a/erpnext/accounts/doctype/share_balance/share_balance.json b/erpnext/accounts/doctype/share_balance/share_balance.json
index dd3e66b1fbf..4cbe2deffe5 100644
--- a/erpnext/accounts/doctype/share_balance/share_balance.json
+++ b/erpnext/accounts/doctype/share_balance/share_balance.json
@@ -74,14 +74,13 @@
    "unique": 0
   }, 
   {
-<<<<<<< HEAD
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "rate", 
-   "fieldtype": "Int", 
+   "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -103,16 +102,7 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
-  }, 
-=======
-   "fieldname": "rate",
-   "fieldtype": "Currency",
-   "in_list_view": 1,
-   "label": "Rate",
-   "read_only": 1,
-   "reqd": 1
   },
->>>>>>> 2fe5fad884 (fix(share balance): use currency field instead of int for rate and amount)
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
@@ -203,14 +193,13 @@
    "unique": 0
   }, 
   {
-<<<<<<< HEAD
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "amount", 
-   "fieldtype": "Int", 
+   "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -232,16 +221,7 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
-  }, 
-=======
-   "fieldname": "amount",
-   "fieldtype": "Currency",
-   "in_list_view": 1,
-   "label": "Amount",
-   "read_only": 1,
-   "reqd": 1
   },
->>>>>>> 2fe5fad884 (fix(share balance): use currency field instead of int for rate and amount)
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
@@ -333,7 +313,6 @@
    "set_only_once": 0, 
    "unique": 0
   }
-<<<<<<< HEAD
  ], 
  "has_web_view": 0, 
  "hide_heading": 0, 
@@ -345,7 +324,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2018-01-10 18:32:36.201124", 
+ "modified": "2025-12-10 08:06:40.611761", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Share Balance", 
@@ -361,21 +340,3 @@
  "track_changes": 1, 
  "track_seen": 0
 }
-=======
- ],
- "istable": 1,
- "links": [],
- "modified": "2025-12-10 08:06:40.611761",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Share Balance",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 1,
- "row_format": "Dynamic",
- "sort_field": "creation",
- "sort_order": "DESC",
- "states": [],
- "track_changes": 1
-}
->>>>>>> 2fe5fad884 (fix(share balance): use currency field instead of int for rate and amount)