Adding CSS files
Merging issues fixed