adding the 7th list item
adding the 7th list item and fixing merge conflicts