adding css and and javascript
conflict