diff --git a/erpnext/accounts/doctype/budget/budget.js b/erpnext/accounts/doctype/budget/budget.js
index 587ef11642a..6e874f7c08c 100644
--- a/erpnext/accounts/doctype/budget/budget.js
+++ b/erpnext/accounts/doctype/budget/budget.js
@@ -22,19 +22,6 @@ frappe.ui.form.on("Budget", {
 			};
 		});
 
-<<<<<<< HEAD
-=======
-		frm.set_query("account", function () {
-			return {
-				filters: {
-					is_group: 0,
-					company: frm.doc.company,
-					root_type: ["in", ["Income", "Expense"]],
-				},
-			};
-		});
-
->>>>>>> 52b406f5f1 (fix(budget): add root_type filter on account field (#55934))
 		erpnext.accounts.dimensions.setup_dimension_filters(frm, frm.doctype);
 	},