diff --git a/templates/repo/modelarts/trainjob/new.tmpl b/templates/repo/modelarts/trainjob/new.tmpl
index 4b6d821bd..7089f23f8 100755
--- a/templates/repo/modelarts/trainjob/new.tmpl
+++ b/templates/repo/modelarts/trainjob/new.tmpl
@@ -134,7 +134,6 @@
                             Ascend NPU</a>
                     </div>
                 </div>
-<<<<<<< HEAD
                 <div class="required inline field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>
                     <input style="width: 60%;" name="display_job_name" id="display_job_name" placeholder={{.i18n.Tr "repo.modelarts.train_job.job_name"}} value="{{.display_job_name}}" tabindex="3" onkeyup="this.value=this.value.replace(/[, ]/g,'')" autofocus required maxlength="64">
@@ -144,32 +143,12 @@
                 <div class="inline field">
                     <label class="label-fix-width" style="font-weight: normal;" for="description">{{.i18n.Tr "repo.modelarts.train_job.description"}}</label>
                     <textarea style="width: 80%;" id="description" name="description" rows="3" maxlength="255" placeholder={{.i18n.Tr "repo.modelarts.train_job.new_place"}} onchange="this.value=this.value.substring(0, 255)" onkeydown="this.value=this.value.substring(0, 255)" onkeyup="this.value=this.value.substring(0, 255)"></textarea>
-=======
-                <div class="required unite min_title inline field">
-                    <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>
-                    <input style="width: 60%;" name="display_job_name" id="display_job_name"
-                        placeholder={{.i18n.Tr "repo.modelarts.train_job.job_name"}} value="{{.display_job_name}}"
-                        tabindex="3" onkeyup="this.value=this.value.replace(/[, ]/g,'')" autofocus required
-                        maxlength="64">
-                    <span class="tooltips" style="display: block;">{{.i18n.Tr "cloudbrain.job_name_rule"}}</span>
-                </div>
-
-                <div class="unite min_title inline field">
-                    <label style="font-weight: normal;"
-                        for="description">{{.i18n.Tr "repo.modelarts.train_job.description"}}&nbsp;&nbsp;</label>
-                    <textarea style="width: 80%;" id="description" name="description" rows="3" maxlength="255"
-                        placeholder={{.i18n.Tr "repo.modelarts.train_job.new_place"}}
-                        onchange="this.value=this.value.substring(0, 255)"
-                        onkeydown="this.value=this.value.substring(0, 255)"
-                        onkeyup="this.value=this.value.substring(0, 255)"></textarea>
->>>>>>> 54c17d894095057ffa220f257ddb415eb103d5a4
                 </div>
                 <div class="ui divider"></div>
 
                 <h4 class="unite title ui header ">{{.i18n.Tr "repo.modelarts.train_job.parameter_setting"}}:</h4>
 
 
-<<<<<<< HEAD
                 <div class="required inline field">
                         <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.code_version"}}</label>
                         <select class="ui dropdown width80 left2" id="code_version" name="branch_name">
@@ -189,39 +168,12 @@
                                 {{end}}
                             {{end}}
                         </select>
-=======
-                <div class="required unite min_title inline field">
-                    <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.code_version"}}</label>
-                    <select class="ui dropdown width80 left2" id="code_version" name="branch_name">
-                        {{if .branch_name}}
-                        <option name="branch_name" value="{{.branch_name}}">{{.branch_name}}</option>
-                        {{range $k, $v :=.Branches}}
-                        {{ if ne $v $.branch_name }}
-                        <option name="branch_name" value="{{$v}}">{{$v}}</option>
-                        {{end}}
-                        {{end}}
-                        {{else}}
-                        <option name="branch_name" value="{{.branchName}}">{{.branchName}}</option>
-                        {{range $k, $v :=.Branches}}
-                        {{ if ne $v $.branchName }}
-                        <option name="branch_name" value="{{$v}}">{{$v}}</option>
-                        {{end}}
-                        {{end}}
-                        {{end}}
-                    </select>
->>>>>>> 54c17d894095057ffa220f257ddb415eb103d5a4
                 </div>
 
 
 
-<<<<<<< HEAD
                 <div class="required inline fields" style="width: 95%;">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.AI_driver"}}</label>
-=======
-                <div class="required unite min_title inline fields" style="width: 90%;">
-                    <label
-                        style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.AI_driver"}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
->>>>>>> 54c17d894095057ffa220f257ddb415eb103d5a4
                     <div class="field" style="flex: 1.5;">
                         <select class="ui dropdown width" id="trainjob_engines">
                             {{range .engines}}
@@ -231,25 +183,16 @@
                     </div>
 
                     <div class="field" style="flex: 2;" id="engine_name">
-<<<<<<< HEAD
                         <select class="ui dropdown width" id="trainjob_engine_versions" name="engine_id">
                                 {{range .engine_versions}}
                                     <option name="engine_id" value="{{.ID}}">{{.Value}}</option>
                                 {{end}}
-=======
-                        <select class="ui dropdown width" id="trainjob_engine_versions" style='width: 100%;'
-                            name="engine_id">
-                            {{range .engine_versions}}
-                            <option name="engine_id" value="{{.ID}}">{{.Value}}</option>
-                            {{end}}
->>>>>>> 54c17d894095057ffa220f257ddb415eb103d5a4
                         </select>
 
                     </div>
 
                 </div>
 
-<<<<<<< HEAD
                 <div class="inline field required">
                         <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.start_file"}}</label>
                         {{if .bootFile}}
@@ -271,35 +214,6 @@
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.run_parameter"}}</label>
                     <span id="add_run_para" style="margin-left: 0.5rem;cursor:pointer;color: rgba(3, 102, 214, 100);font-size: 14px;line-height: 26px;font-family: SourceHanSansSC-medium;"><i class="plus square outline icon"></i>{{.i18n.Tr "repo.modelarts.train_job.add_run_parameter"}}</span>
                     <input  id="store_run_para" type="hidden" name="run_para_list">
-=======
-                <div class="inline unite min_title field required">
-                    <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.start_file"}}</label>
-                    {{if .bootFile}}
-                    <input style="width: 48.5%;" name="boot_file" id="trainjob_boot_file" value="{{.bootFile}}"
-                        tabindex="3" autofocus required maxlength="255">
-                    {{else}}
-                    <input style="width: 48.5%;" name="boot_file" id="trainjob_boot_file" value="" tabindex="3"
-                        autofocus required maxlength="255">
-                    {{end}}
-                    <span>
-                        <i class="question circle icon  link"
-                            data-content={{.i18n.Tr "repo.modelarts.train_job.boot_file_helper"}}
-                            data-position="right center" data-variation="mini"></i>
-                    </span>
-                    <a href="https://git.openi.org.cn/OpenIOSSG/MINIST_Example"
-                        target="_blank">{{.i18n.Tr "cloudbrain.view_sample"}}</a>
-                </div>
-
-                {{template "custom/select_dataset_train" .}}
-                <span class="tooltips"
-                    style="margin-left: 11.5rem;margin-bottom: 2rem;">{{.i18n.Tr "cloudbrain.dataset_path_rule"}}</span>
-                <div class="inline unite min_title field">
-                    <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.run_parameter"}}</label>
-                    <span id="add_run_para"
-                        style="margin-left: 0.5rem;cursor:pointer;color: rgba(3, 102, 214, 100);font-size: 14px;line-height: 26px;font-family: SourceHanSansSC-medium;"><i
-                            class="plus square outline icon"></i>{{.i18n.Tr "repo.modelarts.train_job.add_run_parameter"}}</span>
-                    <input id="store_run_para" type="hidden" name="run_para_list">
->>>>>>> 54c17d894095057ffa220f257ddb415eb103d5a4
                     <div class="dynamic field" style="margin-top: 1rem;">
                         {{if ne 0 (len .params)}}
                         {{range $k ,$v := .params}}
@@ -355,14 +269,8 @@
                         {{end}}
                     </select>
                 </div>
-<<<<<<< HEAD
                 <div class="inline required field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.amount_of_compute_node"}}</label>
-=======
-                <div class="inline required unite min_title field">
-                    <label
-                        style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.amount_of_compute_node"}}</label>
->>>>>>> 54c17d894095057ffa220f257ddb415eb103d5a4
 
                     <div class="ui labeled input" style="width: 5%;">