fix conflicts

templates/repo/modelarts/new.tmpl

@@ -117,12 +117,7 @@
                         <input type="text" list="cloudbrain_dataset" placeholder="选择数据集" name="" id="answerInput" autofocus maxlength="36">
                         <datalist id="cloudbrain_dataset" class="ui search" style='width:385px' name="attachment">
                             {{range .attachments}}
-<<<<<<< HEAD
-                                <option name="attachment" data-value="{{.UUID}}">{{.Attachment.Name}}</option>
-
-=======
                                 <option name="attachment" value="{{.UUID}}">{{.Attachment.Name}}</option>
->>>>>>> 14902388b9cc70d0ee65d1f67f1e6cd9d26053cb
                             {{end}}
                         </datalist>
                         <input type="hidden" name="attachment" id="answerInput-hidden">