list in markdown now working, trying to fix it!
resolved merge conflicts