Use merge instead of cherry-pick when selecting changes