multi-conflict resolution
Resolving conflicts
multi-conflict resolution