Index: sources/gui/GuiController.cpp
===================================================================
diff -u -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 -r67371c6a2861c5e8a2328984ae999bf8df4b0bb7
--- sources/gui/GuiController.cpp	(.../GuiController.cpp)	(revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66)
+++ sources/gui/GuiController.cpp	(.../GuiController.cpp)	(revision 67371c6a2861c5e8a2328984ae999bf8df4b0bb7)
@@ -4,23 +4,13 @@
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
-<<<<<<< HEAD:sources/gui/guicontroller.cpp
- * 
- * \file guicontroller.cpp
- * \author (last) Behrouz NematiPour
- * \date (last) 25-Aug-2020
- * \author (original) Behrouz NematiPour
- * \date (original) 24-Sep-2019
- * 
-=======
  *
  * \file GuiController.cpp
  * \author (last) Peter Lucia
  * \date (last) 15-Oct-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 26-Aug-2020
  *
->>>>>>> master:sources/gui/GuiController.cpp
  */
 #include "GuiController.h"
 
Index: sources/gui/qml/pages/treatment/TreatmentConfirm.qml
===================================================================
diff -u -rb62ab443e75b76a91e35aca6ba2efd84e7199602 -r67371c6a2861c5e8a2328984ae999bf8df4b0bb7
--- sources/gui/qml/pages/treatment/TreatmentConfirm.qml	(.../TreatmentConfirm.qml)	(revision b62ab443e75b76a91e35aca6ba2efd84e7199602)
+++ sources/gui/qml/pages/treatment/TreatmentConfirm.qml	(.../TreatmentConfirm.qml)	(revision 67371c6a2861c5e8a2328984ae999bf8df4b0bb7)
@@ -45,7 +45,7 @@
 
 
     Flickable { id: _flickable
-        objectName: "_confirmTreatmentFlickable"
+        objectName: "_treatmentConfirmFlickable"
         anchors.top: _topMenuBar.bottom
         anchors.left: parent.left
         anchors.bottom: parent.bottom
Index: sources/gui/qml/pages/treatment/TreatmentPrime.qml
===================================================================
diff -u -rb62ab443e75b76a91e35aca6ba2efd84e7199602 -r67371c6a2861c5e8a2328984ae999bf8df4b0bb7
--- sources/gui/qml/pages/treatment/TreatmentPrime.qml	(.../TreatmentPrime.qml)	(revision b62ab443e75b76a91e35aca6ba2efd84e7199602)
+++ sources/gui/qml/pages/treatment/TreatmentPrime.qml	(.../TreatmentPrime.qml)	(revision 67371c6a2861c5e8a2328984ae999bf8df4b0bb7)
@@ -120,6 +120,7 @@
             }
 
             Text { id: _priming_complete
+                objectName: "_primingCompleteText"
                 anchors.horizontalCenter: parent.horizontalCenter
                 text: "Priming Complete!"
                 color: vPriming.primingComplete ? Colors.textMain : "transparent"