Fixed merge issue in questioncontroller