Get question by id
Fix merge issue