There is generally no correct solution for merging, programs can only provide heuristic suggestions. If the suggestion is not what you need, you just need to edit it. I think meld should show you everything you need on the screen. And even if it does not you can use commands like git show <sha1>:<file>
to display every existing version of your file for copy pasting. After you have edited the middle column in meld git will accept it as it is, regardless of the changes you made.
You might also want to try git config --global --add merge.conflictstyle diff3
In the next cherry-pick (or merge) the result of the conflict will be formatted a bit differently and with some luck more suitable for your case.