The most prominent way to resolve conflict in Agile is first to normalize it. Often, conflicts are wrongly looked upon as threats to the product and the team. This view should be discouraged by the Agile project leader and the other team members.
Extra effort is needed to address conflict in the right manner. The resolution process should stay constructive throughout and each team member’s contribution should be appreciated.