created a merge conflict
added super duper list item