Git Cherry Pick Solvo Conflicto

// Resolve all conflits in VS Code git extension and then:

git cherry-pick --continue
Fusinato