Index: firmware/source/sys_main.c
===================================================================
diff -u -r11fcfaffab49f00f358124c8c285a821632eba24 -rdc451e960ab328d05a06137ffdc4d8b2b1601d55
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 11fcfaffab49f00f358124c8c285a821632eba24)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision dc451e960ab328d05a06137ffdc4d8b2b1601d55)
@@ -80,6 +80,7 @@
 #include "FpgaDD.h"
 #include "FPInterface.h"
 #include "Heaters.h"
+#include "Integrity.h"
 #include "Interrupts.h"
 #include "Level.h"
 #include "ModeGenPermeateDefeatured.h"
@@ -209,7 +210,11 @@
     initUltrafiltration();
     initRinsePump();
     initDryBiCart();
+<<<<<<< HEAD
     initSubstitutionPump();
+=======
+    initIntegrity();
+>>>>>>> staging
 
     // FP Modules