<<<>>>I would agree that "makes" should stay singular to correspond to "what," even if the subject of the sentence is plural. If who, what, how, or where, is a singular reference even the nouns or pronouns
preceding are plural, then how would you call sentence B
A- John is the one who is in charge of the food for the party- Correct.
B - John and Mary are the only officers who make decisions around here.
(Is it “makes” or “make”?)