diff --git a/test_tipc/prepare.sh b/test_tipc/prepare.sh
index da84bc70c0ce5bed80d6c88d9bbbca7158e03969..f1d41c6102d87de273e8f6d5d07da3d80d3aa856 100644
--- a/test_tipc/prepare.sh
+++ b/test_tipc/prepare.sh
@@ -162,7 +162,6 @@ elif [ ${MODE} = "whole_infer" ];then
         wget -nc -P  ./inference/ https://paddleocr.bj.bcebos.com/dygraph_v2.0/en/det_r50_vd_sast_icdar15_v2.0_train.tar --no-check-certificate
         cd ./inference/ && tar xf det_r50_vd_sast_icdar15_v2.0_train.tar && tar xf ch_det_data_50.tar && cd ../
     fi
-<<<<<<< HEAD
     if [ ${model_name} == "rec_mv3_none_none_ctc_v2.0" ]; then
         wget -nc -P ./inference/ https://paddleocr.bj.bcebos.com/dygraph_v2.0/en/rec_mv3_none_none_ctc_v2.0_train.tar --no-check-certificate
         cd ./inference/ && tar rec_mv3_none_none_ctc_v2.0_train.tar && cd ../
@@ -192,7 +191,6 @@ elif [ ${MODE} = "whole_infer" ];then
         cd ./inference/ && tar ch_ppocr_server_v2.0_rec_train.tar && cd ../
     fi
     
-=======
     if [ ${model_name} == "det_mv3_db_v2.0" ]; then
         wget -nc -P ./inference/ https://paddleocr.bj.bcebos.com/dygraph_v2.0/en/det_mv3_db_v2.0_train.tar  --no-check-certificate
         cd ./inference/ && tar xf det_mv3_db_v2.0_train.tar && tar xf ch_det_data_50.tar && cd ../
@@ -202,7 +200,6 @@ elif [ ${MODE} = "whole_infer" ];then
         cd ./inference/ && tar xf det_r50_vd_db_v2.0_train.tar && tar xf ch_det_data_50.tar && cd ../
     fi
 fi
->>>>>>> 72affde1ce7d340fcceaa039ded126d0dde617b8
 if [ ${MODE} = "klquant_whole_infer" ]; then
     wget -nc -P ./train_data/ https://paddleocr.bj.bcebos.com/dygraph_v2.0/test/icdar2015_lite.tar --no-check-certificate
     cd ./train_data/ && tar xf icdar2015_lite.tar