more slides
resolve merge