Adding submit a question button
Handle merge conflicts