fixed the questionnaire responses
fixed merge conflicts