Still struggling with updating solutions via terminal to Github the proper way. Help?

I want to update my solution here with the new one I did with DOM:
https://www.theodinproject.com/courses/web-development-101/lessons/rock-paper-scissors

I cloned the repo via terminal:
git clone git@github.com:acchang/curriculum.git

I made changes to project_rock_paper_scissors.md

I did git add -A
Then git commit -m "added my solution using DOM"

Then added my upstream remote
git remote add upstream https://github.com/TheOdinProject/curriculum.git

And then I git pull upstream master

But I get this error:

From https://github.com/TheOdinProject/curriculum
 * branch                master     -> FETCH_HEAD
 * [new branch]          master     -> upstream/master
Auto-merging web_development_101/javascript_basics/project_rock_paper_scissors.md
CONFLICT (content): Merge conflict in web_development_101/javascript_basics/project_rock_paper_scissors.md
Removing ruby_programming/basic_ruby/lesson_introduction_to_ruby_programming.md
Automatic merge failed; fix conflicts and then commit the result.  

And then I try to git fetch upstream and get a ton:

remote: Enumerating objects: 4, done.
remote: Counting objects: 100% (4/4), done.
remote: Total 10 (delta 4), reused 4 (delta 4), pack-reused 6
Unpacking objects: 100% (10/10), 11.45 KiB | 451.00 KiB/s, done.
From https://github.com/TheOdinProject/curriculum
 * [new branch]          105ron-update-contributing              -> upstream/105ron-update-contributing
 * [new branch]          FCC-HTML                                -> upstream/FCC-HTML
 * [new branch]          I3uckwheat-patch-1                      -> upstream/I3uckwheat-patch-1
 * [new branch]          I3uckwheat-patch-2                      -> upstream/I3uckwheat-patch-2
 * [new branch]          chore/archive-introduction-to-rails-section -> upstream/chore/archive-introduction-to-rails-section
 * [new branch]          chore/archive-sinatra-lessons           -> upstream/chore/archive-sinatra-lessons
 * [new branch]          chore/create-introduction-section-for-ruby -> upstream/chore/create-introduction-section-for-ruby
 * [new branch]          chore/fix-formatting-issues-with-new-ruby-lessons -> upstream/chore/fix-formatting-issues-with-new-ruby-lessons
 * [new branch]          chore/follow-up-to-new-ruby-lessons-being-released -> upstream/chore/follow-up-to-new-ruby-lessons-being-released
 * [new branch]          chore/tweak-second-section-of-rails-course -> upstream/chore/tweak-second-section-of-rails-course
 * [new branch]          chore/update-api-mailers-and-advanced-section-content -> upstream/chore/update-api-mailers-and-advanced-section-content
 * [new branch]          chore/update-content-in-active-record-basics-section -> upstream/chore/update-content-in-active-record-basics-section
 * [new branch]          chore/update-content-in-forms-section   -> upstream/chore/update-content-in-forms-section
 * [new branch]          chore/update-content-in-rails-basics-lesson -> upstream/chore/update-content-in-rails-basics-lesson
 * [new branch]          chore/update-content-on-advanced-forms-section -> upstream/chore/update-content-on-advanced-forms-section
 * [new branch]          chore/update-introduction-section-content-in-rails-course -> upstream/chore/update-introduction-section-content-in-rails-course
 * [new branch]          chore/update-moved-rails-introduction-lessons -> upstream/chore/update-moved-rails-introduction-lessons
 * [new branch]          feature/add-new-ruby-basic-lessons-in-v2-folder -> upstream/feature/add-new-ruby-basic-lessons-in-v2-folder
 * [new branch]          feature/fix-formatting-in-ruby-predicate-lesson -> upstream/feature/fix-formatting-in-ruby-predicate-lesson
 * [new branch]          feature/new-introduction-to-ruby-lesson -> upstream/feature/new-introduction-to-ruby-lesson
 * [new branch]          feature/new-ruby-basic-projects-section -> upstream/feature/new-ruby-basic-projects-section
 * [new branch]          fix/mention-of-ror-tut                  -> upstream/fix/mention-of-ror-tut
 * [new branch]          fix/more-ruby-basic-lesson-formatting-issues -> upstream/fix/more-ruby-basic-lesson-formatting-issues
 * [new branch]          fix/setup-github-link                   -> upstream/fix/setup-github-link
 * [new branch]          python-course                           -> upstream/python-course
 * [new branch]          rails-chat-project                      -> upstream/rails-chat-project
 * [new branch]          revert-15273-virtualbox-lubuntu-refactor -> upstream/revert-15273-virtualbox-lubuntu-refactor
 * [new branch]          revert-16062-master                     -> upstream/revert-16062-master
 * [new branch]          revert-16964-master                     -> upstream/revert-16964-master
 * [new branch]          revert-17512-patch-1                    -> upstream/revert-17512-patch-1
 * [new branch]          ryanford-frontend-patch-1               -> upstream/ryanford-frontend-patch-1
 * [new branch]          tracks-refactor                         -> upstream/tracks-refactor
 * [new branch]          update-rails-intro                      -> upstream/update-rails-intro
 * [new branch]          web-dev-101-ruby-extract                -> upstream/web-dev-101-ruby-extract

And finally I try git branch -a and get four pages like this:

  remotes/origin/105ron-update-contributing
  remotes/origin/FCC-HTML
  remotes/origin/HEAD -> origin/master
  remotes/origin/I3uckwheat-patch-1
  remotes/origin/I3uckwheat-patch-2
  remotes/origin/chore/archive-introduction-to-rails-section
  remotes/origin/chore/archive-sinatra-lessons
  remotes/origin/chore/create-introduction-section-for-ruby
  remotes/origin/chore/fix-formatting-issues-with-new-ruby-lessons
  remotes/origin/chore/follow-up-to-new-ruby-lessons-being-released
  remotes/origin/chore/tweak-second-section-of-rails-course
  remotes/origin/chore/update-api-mailers-and-advanced-section-content
  remotes/origin/chore/update-content-in-active-record-basics-section
  remotes/origin/chore/update-content-in-forms-section
  remotes/origin/chore/update-content-in-rails-basics-lesson
  remotes/origin/chore/update-content-on-advanced-forms-section
  remotes/origin/chore/update-introduction-section-content-in-rails-course
  remotes/origin/chore/update-moved-rails-introduction-lessons
  remotes/origin/feature/add-new-ruby-basic-lessons-in-v2-folder
  remotes/origin/feature/new-introduction-to-ruby-lesson
  remotes/origin/feature/new-ruby-basic-projects-section
  remotes/origin/fix/mention-of-ror-tut
  remotes/origin/fix/more-ruby-basic-lesson-formatting-issues
  remotes/origin/fix/setup-github-link
  remotes/origin/master
  remotes/origin/patch-1
  remotes/origin/patch-2
  remotes/origin/python-course
  remotes/origin/rails-chat-project
  remotes/origin/revert-15273-virtualbox-lubuntu-refactor
  remotes/origin/revert-16062-master
  remotes/origin/revert-16964-master
  remotes/origin/ryanford-frontend-patch-1
  remotes/origin/tracks-refactor
  remotes/origin/update-rails-intro
  remotes/origin/web-dev-101-ruby-extract
  remotes/upstream/105ron-update-contributing
  remotes/upstream/FCC-HTML
  remotes/upstream/I3uckwheat-patch-1
  remotes/upstream/I3uckwheat-patch-2
  remotes/upstream/chore/archive-introduction-to-rails-section
  remotes/upstream/chore/archive-sinatra-lessons
  remotes/upstream/chore/create-introduction-section-for-ruby
  remotes/upstream/chore/fix-formatting-issues-with-new-ruby-lessons
  remotes/upstream/chore/follow-up-to-new-ruby-lessons-being-released
  remotes/upstream/chore/tweak-second-section-of-rails-course
  remotes/upstream/chore/update-api-mailers-and-advanced-section-content
  remotes/upstream/chore/update-content-in-active-record-basics-section
  remotes/upstream/chore/update-content-in-forms-section
  remotes/upstream/chore/update-content-in-rails-basics-lesson
  remotes/upstream/chore/update-content-on-advanced-forms-section
  remotes/upstream/chore/update-introduction-section-content-in-rails-course
  remotes/upstream/chore/update-moved-rails-introduction-lessons
  remotes/upstream/feature/add-new-ruby-basic-lessons-in-v2-folder
  remotes/upstream/feature/fix-formatting-in-ruby-predicate-lesson
  remotes/upstream/feature/new-introduction-to-ruby-lesson
  remotes/upstream/feature/new-ruby-basic-projects-section
  remotes/upstream/fix/mention-of-ror-tut
  remotes/upstream/fix/more-ruby-basic-lesson-formatting-issues
  remotes/upstream/fix/setup-github-link
  remotes/upstream/master
  remotes/upstream/python-course
  remotes/upstream/rails-chat-project
  remotes/upstream/revert-15273-virtualbox-lubuntu-refactor
  remotes/upstream/revert-16062-master
  remotes/upstream/revert-16964-master
  remotes/upstream/revert-17512-patch-1
  remotes/upstream/ryanford-frontend-patch-1
  remotes/upstream/tracks-refactor
  remotes/upstream/update-rails-intro
  remotes/upstream/web-dev-101-ruby-extract

At this point, git status tells me:

On branch master
Your branch is ahead of 'origin/master' by 1 commit.
  (use "git push" to publish your local commits)

You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:
	modified:   databases/project_databases.md
	modified:   getting_hired/handling_an_offer.md
	modified:   getting_hired/preparing_to_interview.md
	modified:   getting_hired/project_portfolio.md
	modified:   html_css/project_backgrounds.md
	modified:   html_css/project_bootstrap.md
	modified:   html_css/project_css_frameworks.md
	modified:   html_css/project_design.md
	modified:   html_css/project_html_forms.md

(And more files)

And I cannot do git merge upstream/master. I get told:

error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

Where am I going wrong?

Also, why is the cloned version of student solutions I got when opening it VSCode different than what’s one the site: javascript_basics: project_rock_paper_scissors.md (It starts with [Br3ikros's Solution](https://github.com/Br3ikros/rock-paper-scissors) - [View in Browser](https://br3ikros.github.io/rock-paper-scissors/)
Vs
https://www.theodinproject.com/courses/web-development-101/lessons/rock-paper-scissors

i’ve been trying to use the resources at https://github.com/TheOdinProject/curriculum/blob/master/contributing.md, but I think I got a little confused. Thank you!

well, I got my repo to update via terminal and submitted a pull request to upstream, so I’m sort of there. I just need to figure out what happened. The issue is mainly with updating origin so that it matches upstream, and I think terminal switching to vim has a lot to do with my confusion and the error messages I was getting. This was helpful:

Of the 3 “proper way” documents here:

I found the Odin Project document the most useful:
https://www.theodinproject.com/courses/ruby-programming/lessons/using-git-in-the-real-world#a-git-workflow-for-open-source-contribution

The video spins off in some odd direction and the video-maker is in the middle of something so in the end, he can’t even show, he has to say “imagine x,y,z”.

The article is like the Odin document but the Odin document is simpler.