diff --git a/erpnext/patches/patch_list.py b/erpnext/patches/patch_list.py
index 1325a6e..da8fee3 100644
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -601,10 +601,10 @@
 	},
 	{
 		'patch_module': 'patches.september_2012',
-<<<<<<< Updated upstream
 		'patch_file': 'deprecate_account_balance',
-=======
+	},
+	{
+		'patch_module': 'patches.september_2012',
 		'patch_file': 'profile_delete_permission',
->>>>>>> Stashed changes
 	},
 ]