Index: firmware/App/DGCommon.h
===================================================================
diff -u -r936336e10d1dd531253fb142c2fca803d5f45416 -r300bdc1d729828fd4492bc905bb33faf5529cbda
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 936336e10d1dd531253fb142c2fca803d5f45416)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 300bdc1d729828fd4492bc905bb33faf5529cbda)
@@ -25,7 +25,11 @@
 #define DG_VERSION_MAJOR        0
 #define DG_VERSION_MINOR        6
 #define DG_VERSION_MICRO        0
+<<<<<<< HEAD
+#define DG_VERSION_BUILD        449
+=======
 #define DG_VERSION_BUILD        172
+>>>>>>> DEN-16395-fw-remove-tro-tdi-check-from-post-treatment-modes-and-during-water-flush-and-chem-flush
 
 // ********** build switches **********