[Panels] Even more merge fixes