This is a good question. Let me make a few points that will help you.
In many ways diversity can lead to conflict, because there are so many different views and thoughts, not to mention personalities. However, there is great strength in diversity. The multiplicity of views can be the greatest asset. Therefore, it is important to keep the diversity strong. In light of this what we need is teamwork and excellent conflict resolution.
With this said, true teamwork is when people who are different come together and work together like a well-oiled machine. At times there will be hardship as heads butt, but resolution is needed and can be achieved. A company or organization needs to have good managers, leaders, and human resources to resolve these conflicts.