Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -rd182250ba0c3489513b025b96d1329d4ed07ea80 -r9b41e6f07e226b0f2955ddfd8de883d5c05db38c
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision d182250ba0c3489513b025b96d1329d4ed07ea80)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 9b41e6f07e226b0f2955ddfd8de883d5c05db38c)
@@ -7,9 +7,13 @@
 *
 * @file    BloodLeak.c
 *
-<<<<<<< HEAD
 * @author  (last)      Dara Navaei
-* @date    (last)      10-Oct-2023
+* @date    (last)      23-Oct-2023
+*
+* @author  (original)  Peman Montazemi
+* @date    (original)  18-Mar-2021
+*
+***************************************************************************/
 =======
 * @author  (last)      Bill Bracken
 * @date    (last)      22-Oct-2023