fixed merge issue with avatar css