Index: sources/gui/qml/pages/treatment/TreatmentCreate.qml
===================================================================
diff -u -rd6869b2442823e77476ace6df006d0d000ec9b7a -rc8eb6d0e29f8951a793b2f52d11a08b9902470ee
--- sources/gui/qml/pages/treatment/TreatmentCreate.qml	(.../TreatmentCreate.qml)	(revision d6869b2442823e77476ace6df006d0d000ec9b7a)
+++ sources/gui/qml/pages/treatment/TreatmentCreate.qml	(.../TreatmentCreate.qml)	(revision c8eb6d0e29f8951a793b2f52d11a08b9902470ee)
@@ -1,4 +1,5 @@
 /*!
+<<<<<<< HEAD
  *
  * Copyright (c) 2020 Diality Inc. - All Rights Reserved.
  * \copyright                                                       \n
@@ -10,6 +11,20 @@
  * \date    2020/07/07
  * \author  Peter Lucia
  *
+=======
+ * 
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \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.
+ * 
+ * \file TreatmentCreate.qml
+ * \author (last) Behrouz NematiPour
+ * \date (last) 12-May-2020
+ * \author (original) Behrouz NematiPour
+ * \date (original) 27-Jan-2020
+ * 
+>>>>>>> master
  */
 
 // Qt
@@ -38,7 +53,10 @@
 
         BackButton { id : _backButton
             anchors.verticalCenter: parent.verticalCenter
-            onPressed: clickedBack()
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.margins: _topMenuBar.height / 6
+            onClicked: clickedBack()
         }
     }
 
@@ -56,7 +74,7 @@
             color: "transparent";
             anchors.fill: parent;
             Column {
-                spacing: Variables.createTreatmentSpacing
+                spacing: Variables.cTreatmentSpacing
                 anchors.horizontalCenter: parent.horizontalCenter;
                 anchors.fill: parent;