fix merge conflicts
disable project page ajax sliding