fix style conflicts