PMO conflict resolution