diff --git a/erpnext/manufacturing/report/job_card_summary/job_card_summary.py b/erpnext/manufacturing/report/job_card_summary/job_card_summary.py
index 715b12e4ff9..009dc862e99 100644
--- a/erpnext/manufacturing/report/job_card_summary/job_card_summary.py
+++ b/erpnext/manufacturing/report/job_card_summary/job_card_summary.py
@@ -36,15 +36,7 @@ def get_data(filters):
 		"total_time_in_mins",
 	]
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-	for field in ["work_order", "workstation", "operation", "company"]:
-=======
-	for field in ["work_order"]:
->>>>>>> 481149814e (fix: company name with `,` in `Job Card Summary Report`)
-=======
 	for field in ["work_order", "production_item"]:
->>>>>>> ef7fd670fc (fix: `production_item` filter in `Job Card Summary Report`)
 		if filters.get(field):
 			query_filters[field] = ("in", filters.get(field))