diff --git a/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js b/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js
index 8d254722a4f..99b4c26ac8e 100644
--- a/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js
+++ b/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js
@@ -66,9 +66,6 @@ frappe.query_reports["Purchase Order Analysis"] = {
 			width: "80",
 			options: ["To Pay", "To Bill", "To Receive", "To Receive and Bill", "Completed", "Closed"],
 			get_data: function (txt) {
-<<<<<<< HEAD
-				let status = ["To Bill", "To Receive", "To Receive and Bill", "Completed"];
-=======
 				let status = [
 					"To Pay",
 					"To Bill",
@@ -77,7 +74,6 @@ frappe.query_reports["Purchase Order Analysis"] = {
 					"Completed",
 					"Closed",
 				];
->>>>>>> 3b2879d3a1 (fix(report): allow `Closed` purchase orders to be visible)
 				let options = [];
 				for (let option of status) {
 					options.push({
diff --git a/erpnext/selling/report/sales_order_analysis/sales_order_analysis.js b/erpnext/selling/report/sales_order_analysis/sales_order_analysis.js
index e470672b3a5..b7f7a34c1b8 100644
--- a/erpnext/selling/report/sales_order_analysis/sales_order_analysis.js
+++ b/erpnext/selling/report/sales_order_analysis/sales_order_analysis.js
@@ -65,9 +65,6 @@ frappe.query_reports["Sales Order Analysis"] = {
 			options: ["To Pay", "To Bill", "To Deliver", "To Deliver and Bill", "Completed", "Closed"],
 			width: "80",
 			get_data: function (txt) {
-<<<<<<< HEAD
-				let status = ["To Bill", "To Deliver", "To Deliver and Bill", "Completed"];
-=======
 				let status = [
 					"To Pay",
 					"To Bill",
@@ -76,7 +73,6 @@ frappe.query_reports["Sales Order Analysis"] = {
 					"Completed",
 					"Closed",
 				];
->>>>>>> 2394e76e7d (fix(report): allow `Closed` sales orders to be visible)
 				let options = [];
 				for (let option of status) {
 					options.push({