Fix merge conflict in tuner.py

Remove merge conflict markers and clean up code.

Author: MarvinBeGood

sagemaker-train/src/sagemaker/train/tuner.py

@@ -1465,8 +1465,6 @@ def _build_training_job_definition(self, inputs):
                 if not any(c.channel_name == channel.channel_name for c in input_data_config):
                     input_data_config.append(channel)
 
-<<<<<<< feature_kms_encryped_tuner_output
-=======
         # Include channels built by _prepare_model_trainer_for_tuning (sm_drivers, code)
         if hasattr(model_trainer, "_tuner_channels") and model_trainer._tuner_channels:
             for channel in model_trainer._tuner_channels:
@@ -1482,7 +1480,6 @@ def _build_training_job_definition(self, inputs):
             )
         )
 
->>>>>>> master
         # Build resource config
         resource_config = ResourceConfig(
             instance_type=(