Fixed conflict css file

Fixed conflict css file