diff --git a/csaxs_bec/bec_ipython_client/plugins/flomni/x_ray_eye_align.py b/csaxs_bec/bec_ipython_client/plugins/flomni/x_ray_eye_align.py
index a1e2717..422046f 100644
--- a/csaxs_bec/bec_ipython_client/plugins/flomni/x_ray_eye_align.py
+++ b/csaxs_bec/bec_ipython_client/plugins/flomni/x_ray_eye_align.py
@@ -278,7 +278,12 @@ class XrayEyeAlign:
                     self.gui.show_crosshair()
 
                     self.send_message(
+<<<<<<< Updated upstream
                         "Submit height. Use arrows if far off."
+=======
+                        "Adjust sample height with the arrows if needed, then mark "
+                        "the sample and submit - height will be centered automatically"
+>>>>>>> Stashed changes
                     )
                     self.gui.enable_submit_button(True)
                     self.movement_buttons_enabled(True, True)