Index: firmware/App/Monitors/BloodLeak.h
===================================================================
diff -u -r9273b79631e50be192556bb9eaffd3f3a22d49d2 -rdabc7e65f46140329a5d8b75343e5adbcb225436
--- firmware/App/Monitors/BloodLeak.h	(.../BloodLeak.h)	(revision 9273b79631e50be192556bb9eaffd3f3a22d49d2)
+++ firmware/App/Monitors/BloodLeak.h	(.../BloodLeak.h)	(revision dabc7e65f46140329a5d8b75343e5adbcb225436)
@@ -1,12 +1,17 @@
 /**************************************************************************
 *
+<<<<<<< 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
 *