What will git reset do in this situation?

Hello
I have done a lot of work on many files. I have done several commits. Yesterday it was time to push but before I did a pull. During the pull there was several conflicts and I had to manually merge them. So now I am in stat my_branch|MERING. How ever I does not solve the merging since things does not work any more. I need to get back to the staten before my last git pull and try again.
Will git reset do that for me?
Best regards
Fredrik