diff --git a/templates/repo/debugjob/index.tmpl b/templates/repo/debugjob/index.tmpl
index af6677cc3..e98335e3a 100755
--- a/templates/repo/debugjob/index.tmpl
+++ b/templates/repo/debugjob/index.tmpl
@@ -220,13 +220,8 @@
                                 <div class="two wide column text center">
                                     <!--任务状态 -->
                                     <span class="job-status" id="{{.Cloudbrain.ID}}"
-<<<<<<< HEAD
                                         data-repopath="{{$.RepoRelPath}}{{if eq .Cloudbrain.Type 2}}/grampus/notebook{{else}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}{{end}}"
                                         data-jobid="{{.Cloudbrain.ID}}" data-resource="{{.ComputeResource}}">
-=======
-                                        data-repopath="{{$.RepoRelPath}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}"
-                                        data-jobid="{{.Cloudbrain.ID}}" data-resource="{{.ComputeResource}}" data-bootfile="{{.BootFile}}">
->>>>>>> V20221214
                                         <span><i id="{{.Cloudbrain.ID}}-icon" style="vertical-align: middle;"
                                                 class="{{.Status}}"></i><span id="{{.Cloudbrain.ID}}-text"
                                                 style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span></span>