[Panels] More merge fixes