Resolved conflicting css files