diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.json b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
index 52ee463db02..5e74b1894c9 100644
--- a/erpnext/hr/doctype/leave_allocation/leave_allocation.json
+++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
@@ -237,7 +237,11 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2021-10-01 15:28:26.335104",
+=======
+ "modified": "2022-04-07 09:50:33.145825",
+>>>>>>> f8f1c3d8b5 (fix: enable Track Changes in Leave Allocation)
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Leave Allocation",
@@ -278,5 +282,13 @@
  "show_name_in_global_search": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
+<<<<<<< HEAD
  "timeline_field": "employee"
 }
+=======
+ "states": [],
+ "timeline_field": "employee",
+ "title_field": "employee_name",
+ "track_changes": 1
+}
+>>>>>>> f8f1c3d8b5 (fix: enable Track Changes in Leave Allocation)