git pull之后解决了冲突

Question

但接下来要做什么？

$ git pull
Auto-merging views/upload_photo.handlebars
CONFLICT (content): Merge conflict in views/upload_photo.handlebars
Automatic merge failed; fix conflicts and then commit the result.

James@DESKTOP-8VLS7EG MINGW64 ~/Documents/project (master|MERGING)
$ git merge --abort

James@DESKTOP-8VLS7EG MINGW64 ~/Documents/project.my (master)
$ git status
On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 2 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
Untracked files:
  (use "git add <file>..." to include in what will be committed)

        views/upload_photo_BACKUP_4736.handlebars
        views/upload_photo_BASE_4736.handlebars
        views/upload_photo_LOCAL_4736.handlebars
        views/upload_photo_REMOTE_4736.handlebars

nothing added to commit but untracked files present (use "git add" to track)

我该怎么办？如果我再次执行git pull，我的已解决的冲突文件将被重置。