Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -r9b41e6f07e226b0f2955ddfd8de883d5c05db38c -r9395070b981cccbfe548b606ab7596c08e24aa50
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 9b41e6f07e226b0f2955ddfd8de883d5c05db38c)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 9395070b981cccbfe548b606ab7596c08e24aa50)
@@ -14,15 +14,6 @@
 * @date    (original)  18-Mar-2021
 *
 ***************************************************************************/
-=======
-* @author  (last)      Bill Bracken
-* @date    (last)      22-Oct-2023
->>>>>>> staging
-*
-* @author  (original)  Peman Montazemi
-* @date    (original)  18-Mar-2021
-*
-***************************************************************************/
 
 #include <math.h>   // For pow function
 #include <string.h> // For memset and strlen