CSS styles
Merge errors resolved