working on question creation
fixed merge conflict