multi-conflict
Resolving conflicts
multi-conflict resolution