CSS conflict fixed