publish: Fix conflicts with remote branch into local. EOD push.

generated from commit 6c0360c5df000e5087476a52ba1ead3c867199f6