you can now end the current question by pressing a key
Merge conflict dance