diff --git a/erpnext/setup/doctype/holiday_list/holiday_list.py b/erpnext/setup/doctype/holiday_list/holiday_list.py
index 94ec0b95675e..88da6e2c69d7 100644
--- a/erpnext/setup/doctype/holiday_list/holiday_list.py
+++ b/erpnext/setup/doctype/holiday_list/holiday_list.py
@@ -19,6 +19,11 @@ class HolidayList(Document):
 	def validate(self):
 		self.validate_days()
 		self.total_holidays = len(self.holidays)
+<<<<<<< HEAD
+=======
+		self.validate_duplicate_date()
+		self.sort_holidays()
+>>>>>>> ad137250fc (fix(Holiday List): sort holidays on save to avoid disorienting the user (#42236))
 
 	@frappe.whitelist()
 	def get_weekly_off_dates(self):
@@ -33,8 +38,6 @@ def get_weekly_off_dates(self):
 
 			self.append("holidays", {"description": _(self.weekly_off), "holiday_date": d, "weekly_off": 1})
 
-		self.sort_holidays()
-
 	@frappe.whitelist()
 	def get_supported_countries(self):
 		from holidays.utils import list_supported_countries
@@ -76,8 +79,6 @@ def get_local_holidays(self):
 				"holidays", {"description": holiday_name, "holiday_date": holiday_date, "weekly_off": 0}
 			)
 
-		self.sort_holidays()
-
 	def sort_holidays(self):
 		self.holidays.sort(key=lambda x: getdate(x.holiday_date))
 		for i in range(len(self.holidays)):