What people often mean by getting rid of conflict is getting rid of diversity, and it is of the utmost importance that these should not be considered the same.
Still, intuitive assumptions about behavior is only the starting point of systematic analysis, for alone they do not yield many interesting implications.
