fixed merge conflict with setting surveys