diff --git a/erpnext/selling/report/sales_analytics/sales_analytics.js b/erpnext/selling/report/sales_analytics/sales_analytics.js
index 95b742ea584..7c5d5436877 100644
--- a/erpnext/selling/report/sales_analytics/sales_analytics.js
+++ b/erpnext/selling/report/sales_analytics/sales_analytics.js
@@ -73,27 +73,11 @@ frappe.query_reports["Sales Analytics"] = {
 			default: "Monthly",
 			reqd: 1,
 		},
-<<<<<<< HEAD
-=======
-		{
-			fieldname: "curves",
-			label: __("Curves"),
-			fieldtype: "Select",
-			options: [
-				{ value: "select", label: __("Select") },
-				{ value: "all", label: __("All") },
-				{ value: "non-zeros", label: __("Non-Zeros") },
-				{ value: "total", label: __("Total Only") },
-			],
-			default: "select",
-			reqd: 1,
-		},
 		{
 			fieldname: "show_aggregate_value_from_subsidiary_companies",
 			label: __("Show Aggregate Value from Subsidiary Companies"),
 			fieldtype: "Check",
 		},
->>>>>>> c23af6af41 (feat: Show Aggregate Value from Subsidiary Companies)
 	],
 	get_datatable_options(options) {
 		return Object.assign(options, {