Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r66137c87d01cef2f8d20796a29efc928bdb59d50 -rf8b2a4fe19bf60994920d7e310069a70fdbaa60c
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 66137c87d01cef2f8d20796a29efc928bdb59d50)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision f8b2a4fe19bf60994920d7e310069a70fdbaa60c)
@@ -29,6 +29,7 @@
 #include "OperationModes.h"
 #include "PersistentAlarm.h"
 #include "SystemCommMessages.h"
+#include "Timers.h"
 #include "Utilities.h"
 
 /**
@@ -93,7 +94,11 @@
 /// FPGA size of V3 read bytes.
 #define FPGA_SIZE_OF_V3_READ_BYTES      ( FPGA_READ_V3_END_BYTE_NUM - FPGA_READ_V3_START_BYTE_NUM )
 
+<<<<<<< HEAD
 #define PROCESSOR_FPGA_CLOCK_DIFF_TOLERANCE     1               ///< Tolerance for processor clock speed check against FPGA clock.
+=======
+#define PROCESSOR_FPGA_CLOCK_DIFF_TOLERANCE   1                 ///< Tolerance for processor clock speed check against FPGA clock.
+>>>>>>> a26a94535a8931d2a86487c48d55e4549934bfe8
 
 // FPGA header struct.
 #pragma pack(push,1)
@@ -342,10 +347,17 @@
 static FPGA_ACTUATORS_T     fpgaActuatorSetPoints;                  ///< FPGA actuator set points structure.
 static U08 fpgaReadByteSize;                                        ///< FPGA read byte size.
 
+<<<<<<< HEAD
 //#ifndef DEBUG_ENABLED - TODO: uncomment it DN-15SEPT2022
 static U16 currentFPGATimerCount_ms;                                    ///< Current FPGA timer count in ms.
 static U32 currentTimerCount_ms;                                        ///< Current processor timer count in ms.
 //#endif
+=======
+#ifndef DEBUG_ENABLED
+static U16 currentFPGATimerCount_ms;                                       ///< Current FPGA timer count in ms.
+static U32 currentTimerCount_ms;                                           ///< Current processor timer count in ms.
+#endif
+>>>>>>> a26a94535a8931d2a86487c48d55e4549934bfe8
 
 // ********** private function prototypes **********
 
@@ -908,7 +920,11 @@
     U32 const diffFPGATimerCount = (U32)u16DiffWithWrap( currentFPGATimerCount_ms, newFPGATimerCount_ms );
     U32 const diffTimerCount = u32DiffWithWrap( currentTimerCount_ms, newTimerCount_ms );
 
+<<<<<<< HEAD
     if ( getCurrentOperationMode() != DG_MODE_INIT )
+=======
+    if ( getCurrentOperationMode() != MODE_INIT )
+>>>>>>> a26a94535a8931d2a86487c48d55e4549934bfe8
     {
         if ( abs( diffFPGATimerCount - diffTimerCount ) > PROCESSOR_FPGA_CLOCK_DIFF_TOLERANCE )
         {
@@ -924,6 +940,7 @@
     currentTimerCount_ms = newTimerCount_ms;
 //#endif
 }
+
 /*********************************************************************//**
  * @brief
  * The setupDMAForWriteCmd function sets the byte count for the next DMA