Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml
===================================================================
diff -u -r07fa2cd47bf538e89c48fc7d425674f20afc9f2a -r09fc72d1410ab86f8de7b00dd7de4ea5612cf470
--- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml	(.../EndTreatmentRinseback.qml)	(revision 07fa2cd47bf538e89c48fc7d425674f20afc9f2a)
+++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml	(.../EndTreatmentRinseback.qml)	(revision 09fc72d1410ab86f8de7b00dd7de4ea5612cf470)
@@ -90,11 +90,7 @@
                 anchors {
                     top                 : _deliveredVolumeText.bottom
                     bottom              : undefined
-<<<<<<< Updated upstream
-                    topMargin           : _timeoutText.anchors.bottomMargin
-=======
                     topMargin           : _timeout.anchors.bottomMargin
->>>>>>> Stashed changes
                 }
                 visible         : vTDTreatmentStates.rbPaused
                 height          : 25