Fix conflict css