slide menu done
conflict fixes