fix merge conflict in survey_control