Index: firmware/source/sys_main.c
===================================================================
diff -u -rdc451e960ab328d05a06137ffdc4d8b2b1601d55 -rb265dcfa9029a6db5ab4b6a966aae70103004781
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision dc451e960ab328d05a06137ffdc4d8b2b1601d55)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision b265dcfa9029a6db5ab4b6a966aae70103004781)
@@ -210,11 +210,8 @@
     initUltrafiltration();
     initRinsePump();
     initDryBiCart();
-<<<<<<< HEAD
     initSubstitutionPump();
-=======
     initIntegrity();
->>>>>>> staging
 
     // FP Modules