Historic development of positive psychology

Within the past two decades, positive psychology and humanistic psychology have been at odds over their philosophical foundations and approaches to human well-being.
Briefly discuss the historic development of positive psychology and humanistic psychology. Which perspective do you endorse and why?
Support your position. Your defense must cite one scholarly article that makes a case for positive psychology and another that argues for humanistic psychology.