publish: Merge conflicts.

generated from commit 77de27055ff1feace8dc898c0c18989a6f08fe32