Including css
Resolved conflict