Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rc288f2956e37f1f0b964b077af7c39b6387a5df6 -re521fb5da3023f5b6174bdced7e1ee1c54e64610
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision c288f2956e37f1f0b964b077af7c39b6387a5df6)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision e521fb5da3023f5b6174bdced7e1ee1c54e64610)
@@ -48,7 +48,6 @@
 /*********************************************************************//**
 * @brief
 * The initPreTreatmentMode function initializes the Pre-Treatment mode.
-<<<<<<< HEAD
 * @details Inputs: none
 * @details Outputs: Initializes the Treatment Parameters session and sets the initial
 * Pre-Treatment sub-state.
@@ -80,7 +79,7 @@
 }
 
 /*********************************************************************//**
- * @briefs
+ * @brief
  * The execPreTreatmentMode function executes the Pre-Treatment
  * mode state machine.
  * @details \b Inputs: stop button status and system conditions via helpers.