Index: firmware/source/sys_main.c
===================================================================
diff -u -r8bd2386ed976da1b73ad6e29ddafa5e493b29964 -rdc451e960ab328d05a06137ffdc4d8b2b1601d55
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 8bd2386ed976da1b73ad6e29ddafa5e493b29964)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision dc451e960ab328d05a06137ffdc4d8b2b1601d55)
@@ -99,6 +99,7 @@
 #include "StateFlushFilterDefeatured.h"
 #include "StateFlushPermeate.h"
 #include "StateInletPressureCheck.h"
+#include "SubstitutionPump.h"
 #include "SystemCommDD.h"
 #include "TaskBG.h"
 #include "TDInterface.h"
@@ -209,7 +210,11 @@
     initUltrafiltration();
     initRinsePump();
     initDryBiCart();
+<<<<<<< HEAD
+    initSubstitutionPump();
+=======
     initIntegrity();
+>>>>>>> staging
 
     // FP Modules