css on shop page
resolved merge conflict