render take survey page
merge conflicts resolved