diff --git a/ConstantVelocityAcquisitionPlugin/constant_velocity_acquisition.py b/ConstantVelocityAcquisitionPlugin/constant_velocity_acquisition.py
index 59ce9cc..615be15 100644
--- a/ConstantVelocityAcquisitionPlugin/constant_velocity_acquisition.py
+++ b/ConstantVelocityAcquisitionPlugin/constant_velocity_acquisition.py
@@ -92,5 +92,5 @@ def end_acquisition_model(self, model):
         model : object
             navigate model
         """
-        axis = model.configuration["experiment"]["ConstantVelocity"]["axis"]
+        axis = model.configuration["experiment"]["ConstantVelocity"]["axis"].lower()
         model.active_microscope.stages[axis].stop()
diff --git a/ConstantVelocityAcquisitionPlugin/model/features/ConstantVelocityAcquisition_feature.py b/ConstantVelocityAcquisitionPlugin/model/features/ConstantVelocityAcquisition_feature.py
index 6c57921..87511ac 100644
--- a/ConstantVelocityAcquisitionPlugin/model/features/ConstantVelocityAcquisition_feature.py
+++ b/ConstantVelocityAcquisitionPlugin/model/features/ConstantVelocityAcquisition_feature.py
@@ -183,13 +183,7 @@ def pre_func_signal(self):
 
         logger.info(f"*** z start position: {self.start_position}")
         logger.info(f"*** z end position: {self.stop_position}")
-<<<<<<< HEAD:ConstantVelocityAcquisitionPlugin/model/features/ConstantVelocityAcquisition_feature.py
         logger.info(f"*** Expected number of steps: {self.number_z_steps}")
-=======
-        pos = self.asi_stage.get_axis_position(self.axis)
-        print(f"Current Position = {pos}")
-        print(f"Start position = {self.start_position*1000}")
->>>>>>> a681d38da2cde2d087f333d9188edecb6370ecb9:ConstantVelocityAcquisitionPlugin/model/features/cva_conpro.py
 
         self.step_size_mm = step_size_mm
         self.asi_stage.scanr(
@@ -295,26 +289,12 @@ def end_func_signal(self):
             or self.end_acquisition
             or self.end_signal_temp > 0
         ):
-<<<<<<< HEAD:ConstantVelocityAcquisitionPlugin/model/features/ConstantVelocityAcquisition_feature.py
             if self.stack_cycling_mode == "per_stack":
                 self.update_channel()
                 # if run through all the channels, move to next position
                 if self.current_channel_in_list == 0:
                     return True
             else:
-=======
-            print("returning true from stop or end acquisition end_func_signal")
-            print("per stack if statment called")
-            print(f"channel list: {self.current_channel_in_list}")
-            self.update_channel()
-            print("if statement update channel finished")
-            # if run through all the channels, move to next position
-            if self.current_channel_in_list == 0:
-                print(
-                    f"in if channel list = 0 statement, channel = "
-                    f"{self.current_channel_in_list}"
-                )
->>>>>>> a681d38da2cde2d087f333d9188edecb6370ecb9:ConstantVelocityAcquisitionPlugin/model/features/cva_conpro.py
                 return True
 
         return False
@@ -361,13 +341,7 @@ def cleanup(self):
 
     def pre_data_func(self):
         self.received_frames_v2 = self.received_frames
-<<<<<<< HEAD:ConstantVelocityAcquisitionPlugin/model/features/ConstantVelocityAcquisition_feature.py
         self.total_frames = self.expected_frames * self.channels
-=======
-        # self.total_frames = self.expected_frames * self.channels
-        print(f"total channels = {self.channels}")
-        print(f"total frames = {self.total_frames}")
->>>>>>> a681d38da2cde2d087f333d9188edecb6370ecb9:ConstantVelocityAcquisitionPlugin/model/features/cva_conpro.py
 
     def in_data_func(self, frame_ids):
         self.received_frames += len(frame_ids)