added some styling
resolved conflict