fixing style conflicts