Fixed merge conflict and updated CSS