updated styling
resolved conflict