css editing
fixed merge conflicts