Index: firmware/App/Monitors/BloodLeak.h
===================================================================
diff -u -rdabc7e65f46140329a5d8b75343e5adbcb225436 -rd4ff0e628e0cd7866272a8a8a6f26db97286e3b4
--- firmware/App/Monitors/BloodLeak.h	(.../BloodLeak.h)	(revision dabc7e65f46140329a5d8b75343e5adbcb225436)
+++ firmware/App/Monitors/BloodLeak.h	(.../BloodLeak.h)	(revision d4ff0e628e0cd7866272a8a8a6f26db97286e3b4)
@@ -1,19 +1,14 @@
 /**************************************************************************
 *
-<<<<<<< HEAD
 * Copyright (c) 2025-2026 Diality Inc. - All Rights Reserved.
-=======
-* Copyright (c) 2025-2025 Diality Inc. - All Rights Reserved.
->>>>>>> staging
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    BloodLeak.h
 *
-<<<<<<< HEAD
-* @author  (last)      Dara Navaei
-* @date    (last)      10-Sep-2024
+* @author  (last)      Jashwant Gantyada
+* @date    (last)      07-Jan-2026
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  10-Sep-2024