merge master from storage, delete the third line in SidePanelCellRenderer