I managed to to resolve this issue with thisthese git commands in order:
git init
git rm -r -f *
git merge origin main
git add *
git commit -m 'merging'
git pull
git init
git rm -r -f *
git merge origin main
git add *
git commit -m 'merging'
git pull