Abstract
This article is a literature review that discusses the effect of diversity on the occurrence of team conflict and how emotion al intelligence role as a moderating variable to improve team performance. Diversity may trigger relationship conflicts within the team that affect their performance. However, not all diversity has a negative impact if the organization concerned can create a cohesiv e team. Team members with higher levels of expertise on the team should be given more influence over team processes and outcomes. Organizational support and openness have different effects on the relationship of diversity to the occurrence of conflict within the organiz ation. The emotional intelligence of team members was found to play an important role in reducing the negative effects that might be trigg ered by diversity. Emotionally intelligent team members are generally more capable of dealing with differences. Thus, they are more aware of the creative potential of their different thoughts, values, and beliefs. In conclusion, one of the efforts to improve team performance is to reduce or prevent conflicts within the team through emotional intelligence.