Index: firmware/App/DGCommon.h
===================================================================
diff -u -rc035ba73d3aa5c82de34265d4dcfc6a0d255d5b2 -r300bdc1d729828fd4492bc905bb33faf5529cbda
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision c035ba73d3aa5c82de34265d4dcfc6a0d255d5b2)
+++ 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 **********