updated styling
resolved merge conflict