Pātuhitia tēnei: New directions in conflict theory