Problema no git e github

Estou com uns conflitos no git que que estão me impedindo de de mandar meus prs para o GitHub. Esse é o erro: miguel@DESKTOP-L7CUOGC MINGW64 ~/Desktop/praticando comandos/barros-Miguel-Martins (master|MERGING) $ git status On branch master Your branch and 'origin/master' have diverged, and have 1 and 1 different commits each, respectively. (use "git pull" to merge the remote branch into yours) All conflicts fixed but you are still merging. (use "git commit" to conclude merge) Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) modified: modulo1/operadores/template_javascript (1)/template_javascript/index.html modified: modulo1/operadores/template_javascript (1)/template_javascript/index.js modified: modulo1/variaveis/template_javascript/template_javascript/index.js Untracked files: (use "git add ..." to include in what will be committed) modulo1/funcoes/ modulo1/strings-arrays/ praticando-comandos/ miguel@DESKTOP-L7CUOGC MINGW64 ~/Desktop/praticando comandos/barros-Miguel-Martins (master|MERGING) $ git pull error: You have not concluded your merge (MERGE_HEAD exists). hint: Please, commit your changes before merging. fatal: Exiting because of unfinished merge.