add logic to survey responses
fix merge conflicts with survey results