update sliding menu
fixe conflicts