From 05778bb81ae74d845e28bc77e6d83c9c2fd2c889 Mon Sep 17 00:00:00 2001
From: Diptanil Saha <diptanil@frappe.io>
Date: Fri, 5 Dec 2025 16:40:57 +0530
Subject: [PATCH] chore: resolve conflict

---
 erpnext/utilities/bulk_transaction.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/erpnext/utilities/bulk_transaction.py b/erpnext/utilities/bulk_transaction.py
index 72d0ff15c0d..1dc45b426b7 100644
--- a/erpnext/utilities/bulk_transaction.py
+++ b/erpnext/utilities/bulk_transaction.py
@@ -16,16 +16,10 @@ def transaction_processing(data, from_doctype, to_doctype):
 	else:
 		deserialized_data = data
 
-<<<<<<< HEAD
-=======
-	if isinstance(args, str):
-		args = frappe._dict(json.loads(args))
-
 	skipped_records = [d for d in deserialized_data if d.get("status") in ("On Hold", "Closed")]
 
 	deserialized_data = [d for d in deserialized_data if d.get("status") not in ("On Hold", "Closed")]
 
->>>>>>> 31d55248e4 (Merge pull request #50931 from diptanilsaha/gh-49357)
 	length_of_data = len(deserialized_data)
 
 	skipped_msg = ""