Fix slide up, down
fix conflix