fix to edit and take survey bugs
merge conflict fixed