add slide menu
fixe conflicts
fix conflicts