Git: How to fix commit during rebase

I came across the following problem:

During git rebase one of automatically resolved commits has an error, i.e. as a result of automatic resolution, a function declaration was introduced for the second time in the header file and compilation fails.

My question is: is it possible to go back to that automatically resolved commit, resolve it manually and then continue with the rebase, assuming that I am still within the rebase process?