Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r28643ed284d6e6c61c15df02d62f49577a38cce4 -r405d46b9b75630e35f003c42647d85c83d166b62
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 28643ed284d6e6c61c15df02d62f49577a38cce4)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 405d46b9b75630e35f003c42647d85c83d166b62)
@@ -38,7 +38,6 @@
 static const U32 AIR_TRAP_ILLEGAL_LEVELS_PERSISTENCE = ( MS_PER_SECOND * 2 / TASK_PRIORITY_INTERVAL );
 /// Volume (in mL) of venous portion of blood circuit line.  TODO - get actual volume from Systems.
 #define VENOUS_LINE_VOLUME_ML               ( 200.0 )
-<<<<<<< HEAD
 #define DATA_PUBLISH_COUNTER_START_COUNT    7                                                      ///< Data publish counter start count.
 
 /// Defined states for the air trap controller state machine.
@@ -55,25 +54,7 @@
 
 static AIR_TRAP_STATE_T airTrapControllerState;                                             ///< Current state of air trap controller state machine.
 static U32 airTrapDataPublicationTimerCounter;                                              ///< Used to schedule air trap data publication to CAN bus.
-
-=======
 
-/// Defined states for the air trap controller state machine.
-typedef enum AirTrap_States
-{
-    AIR_TRAP_INIT_STATE = 0,                ///< Initialization state
-    AIR_TRAP_MANUAL_CONTROL_STATE,          ///< Manually control air trap valve state
-    AIR_TRAP_VALVE_CLOSED_STATE,            ///< Valve closed state - until air detected at lower level
-    AIR_TRAP_VALVE_OPEN_STATE,              ///< Valve open state - until fluid detected at upper level
-    NUM_OF_AIR_TRAP_STATES                  ///< Number of air trap controller states
-} AIR_TRAP_STATE_T;
-
-// ********** private data **********
-
-static AIR_TRAP_STATE_T airTrapControllerState;                                             ///< Current state of air trap controller state machine.
-static U32 airTrapDataPublicationTimerCounter = 0;                                          ///< Used to schedule air trap data publication to CAN bus.
-
->>>>>>> cc-vectorcast2
 /// Interval (in ms) at which to publish air trap data to CAN bus.
 static OVERRIDE_U32_T airTrapDataPublishInterval = { AIR_TRAP_DATA_PUB_INTERVAL, AIR_TRAP_DATA_PUB_INTERVAL, 0, 0 };
 static OVERRIDE_U32_T airTrapLevels[ NUM_OF_AIR_TRAP_LEVEL_SENSORS ];                       ///< Detected air trap level for each level sensor.
@@ -370,7 +351,6 @@
         result = AIR_TRAP_VALVE_CLOSED_STATE;
     }
 
-
     return result;
 }