It’s hard to say what the issue is since we are lacking some context. Have you made changes and commits after the commit you are trying to revert, or was that commit the most recent commit in the history?

Same with the fixes you mention, what exactly did you do to fix the merge conflict? Did you manually fix the files with the conflicts? Since you mention being a beginner with git, a common mistake would be not actually going into the files and resolving the conflicts, and just immediately doing git add/rm on the conflicting files.

I’m happy to walk you through the process if you could give a few more details, git can be complicated when you’re a beginner :)