Manage different types of conflict

Manage different types of conflict

X