fixing css conflicts and funky merge artifacts