diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index 2d07daa5b96..8ec055e28a4 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -146,10 +146,6 @@ frappe.ui.form.on('Payment Entry', {
 			};
 		});
 
-<<<<<<< HEAD
-	refresh: function(frm) {
-		erpnext.hide_company();
-=======
 		frm.set_query("sales_taxes_and_charges_template", function () {
 			return {
 				filters: {
@@ -170,7 +166,6 @@ frappe.ui.form.on('Payment Entry', {
 	},
 	refresh: function (frm) {
 		erpnext.hide_company(frm);
->>>>>>> 9fe47ac101 (fix: set query filters for sales / purchase tax template on PE)
 		frm.events.hide_unhide_fields(frm);
 		frm.events.set_dynamic_labels(frm);
 		frm.events.show_general_ledger(frm);