The -s ours strategy discarded the merged tag content, so packages
with vendored sources were not actually merged into master. Use a
regular merge for all packages. Reverts d223e6ca.