Scripts and css
Merge conflicts