Order questions by number_in_instrument by default
Fix merge conflict