stylesheet conflicts updated