The correct term that best fits the incomplete sentence is <em><u>'whatever.'</u></em> Read the following sentences and you will be able to determine that the term 'whatever' is best.
<em>Which </em>he did to study for the final exam must have been helpful; his grade improved from a B to an A.
<em>That </em>he did to study for the final exam must have been helpful; his grade improved from a B to an A.
<em>So what </em>he did to study for the final exam must have been helpful; his grade improved from a B to an A.
<em>Whatever</em> he did to study for the final exam must have been helpful; his grade improved from a B to an A.
We can suggest this as the correct answer because of the hint words 'issues', 'conflicts' and 'resolved' in the question, as they are synonyms or related to the words 'problem' and 'solution'. ☺