Resolving cherry-pick conflicts