Given a disfluent sentence, modify the sentence to it to its equivalent fluent form, preserving the meaning of the sentence.

What two public officials, oops no that um, agencies, conflict under the definition of civil disobedience?
What two public agencies conflict under the defnintion of civil disobedience?

Which or no make that what theorem defines the main role of primes in number theory?
What theorem defines the main role of primes in number theory?

What is the mace displayed in sorry not that but what is inlaid with gold panned from French rivers?
What is inlaid with gold panned from French rivers?