deleted the answer_choices_user controller
resolved pull conflict