Olivier Massot 6c3be57b69 fix conflicts %!s(int64=2) %!d(string=hai) anos
..
menuBuilder 6c3be57b69 fix conflicts %!s(int64=2) %!d(string=hai) anos
menuComposer.test.ts df7f0a8c24 upgrade node+nuxt, post upgrade fixes %!s(int64=2) %!d(string=hai) anos