Fix Component Library workflow failing builds on the main branch

[JanHamara]

What it the unexpected behaviour?

For one of our workflows (Component Library) on Wave repo, we are having a build failing on main branch since this commit.

The logs from that commit cannot be found anymore, probably have been deleted after some time based on retention configuration, however, the latest log that can be retrieved from one of failing builds shows that it is a merge conflict that’s causing the issue.

What is the proposed solution?

As per @nlopin we need to manually merge master into next, resolving the conflicts.