changed pages css
Fixed merge conflicts