Index: firmware/App/DGCommon.h
===================================================================
diff -u -r300bdc1d729828fd4492bc905bb33faf5529cbda -rd60221274135193c0258cfa79b4ac6bd3e47a6e2
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 300bdc1d729828fd4492bc905bb33faf5529cbda)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision d60221274135193c0258cfa79b4ac6bd3e47a6e2)
@@ -25,12 +25,9 @@
 #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 **********
 
 #ifndef _RELEASE_