Fixed conflict, and uploaded updated css