fix conflicts

Author: jerrypeng7773

tests/unit/sagemaker/workflow/test_training_step.py

@@ -13,21 +13,15 @@
 # language governing permissions and limitations under the License.
 from __future__ import absolute_import
 
-<<<<<<< HEAD
-=======
 import os
->>>>>>> support-estimator-output-param
 import json
 
 import pytest
 import sagemaker
 import warnings
 
 from sagemaker.workflow.pipeline_context import PipelineSession
-<<<<<<< HEAD
-=======
 from sagemaker.workflow.parameters import ParameterString
->>>>>>> support-estimator-output-param
 
 from sagemaker.workflow.steps import TrainingStep
 from sagemaker.workflow.pipeline import Pipeline