added new slides
fixed merge issues