I want to git push my html doc to my git repository but i was unable to publish the document to my repository

C:Userspiercing GbAy-code->git status
On branch main
Your branch and ‘origin/main’ have diverged,
and have 1 and 1 different commits each, respectively.
(use “git pull” if you want to integrate the remote branch with yours)

You have unmerged paths.
(fix conflicts and run “git commit”)
(use “git merge –abort” to abort the merge)

Changes to be committed:
modified: Assignment/solution.html

Unmerged paths:
(use “git add …” to mark resolution)
both added: Assignment/css/style.css
I’m expecting my assignment document to preview on my repository page