I mean, you just need to look at the conflicting files, fix up the code, then stage those changes and pop a new commit

There's no "special" merge conflict resolution commit "type"

As for fixing the code itself, I usually look at what changed between both versions, and then re-author the code such that both changes make "sense"