sortable slides
solve conflict