merged stylesheet conflicts