Critically examine conflict resolution according to M.P. Follett. Explain how McGregor took forward her ideas in the context of complex organizations.