how to redo merge conflict resolution for cherrypick without losing the changes(after the commit)?

Question

Here are the steps that have led to the issue:

1. Cherry picked a commit
2. Resolved the merge conflict
3. git add the files that were resolved