Who among the following introduced the concepts and phrases-'conflict resolution' and'the task of leadership'?

Mary Parker Follett, a pioneering management theorist, introduced the concepts of 'conflict resolution' and 'the task of leadership'. She emphasized constructive conflict resolution through integration rather than domination or compromise. Her work on participative management and power-with rather than power-over was foundational. Fayol focused on administrative principles, Mayo on Hawthorne studies, and Barnard on executive functions and acceptance theory.