css added
fixed merge conflicts