correct style conflicts