last pics edited
slide_wrapper added
resolved conflict