git pull broke something - how to go back to previous working commit and merge the remote changes in again?

Question

I commited a new feature locally, pulled from remote and got merge conflicts. After resolving them, my feature stopped working (seems like I made an error).

My idea w