fixed conference pane
merge