fixing some style conflicts