fixed slide deck
fixed merge errors