fixed some sliding problems
fixed merge conflicts