changes
dealing only with list questions
merge conflicts