Index: DDDefs.h
===================================================================
diff -u -r189edd8787d82292673701a1464dca764f3fbec5 -r9e603cb0a62de76944e9c2d21e839586e0a1ce10
--- DDDefs.h	(.../DDDefs.h)	(revision 189edd8787d82292673701a1464dca764f3fbec5)
+++ DDDefs.h	(.../DDDefs.h)	(revision 9e603cb0a62de76944e9c2d21e839586e0a1ce10)
@@ -379,11 +379,7 @@
     D3_VALV,                                      ///< Valve Hydraulics Inlet (D3)
     D80_VALV,                                     ///< Valve Dry Bicarb (D80)
     D81_VALV,                                     ///< Valve De-scaler (D81)
-<<<<<<< HEAD
     D85_VALV,                                     ///< Valve DryBicart vent (D85)
-=======
-    D85_VALV,                                     ///< Reserved space mapped for Valve (D85)
->>>>>>> LDT-1415-pressures-monitoring-td
     LAST_HYD_VALVE = D85_VALV,                    ///< End of Hydraulics valve of group
     FIRST_BC_VALVE,                               ///< Start of Balancing Chamber valve group
     D23_VALV = FIRST_BC_VALVE,                    ///< Balancing chamber Valve 1 (D23)