merge
beamer reset disconnect, solo display