docs styling
resolved conflict