Index: Utilities.h
===================================================================
diff -u -r246c9f85e996aecd4dd10d4beb71f80fac998448 -r51fff72291e1b83cc32e8f28bad7f821dfcc5b9c
--- Utilities.h	(.../Utilities.h)	(revision 246c9f85e996aecd4dd10d4beb71f80fac998448)
+++ Utilities.h	(.../Utilities.h)	(revision 51fff72291e1b83cc32e8f28bad7f821dfcc5b9c)
@@ -40,11 +40,7 @@
     TIME_WINDOWED_COUNT_CAN_PARITY,                         ///< CAN parity error
     TIME_WINDOWED_COUNT_FPGA_UART_FRAME_ERROR,              ///< FPGA UART frame error
     TIME_WINDOWED_COUNT_FPGA_UART_OVERRUN,                  ///< FPGA UART overrun error
-<<<<<<< HEAD
     TIME_WINDOWED_COUNT_FPGA_CLOCK_SPEED_ERROR,             ///< FPGA clock speed error
-=======
-    TIME_WINDOWED_COUNT_FPGA_CLOCK_SPEED_ERROR,             ///< FPGA clock speed error - DN-16SEPT2022
->>>>>>> 486939ad40e3e324ca43b3771d12e4b37016754f
 #ifdef _HD_
     TIME_WINDOWED_COUNT_BP_COMMUTATION_ERROR,               ///< Blood pump commutation error
     TIME_WINDOWED_COUNT_DIP_COMMUTATION_ERROR,              ///< Dialysate inlet pump commutation error