diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
index 545ea22d799..22be5299280 100644
--- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
+++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
@@ -393,11 +393,7 @@
   }
  ],
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-12-18 12:20:08.965120",
-=======
  "modified": "2024-08-13 10:41:18.381165",
->>>>>>> 0cf478c4c2 (refactor: cr and dr note filter in Statement of Accounts)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Process Statement Of Accounts",