styled lists
resolved merge conflicts