Proactive conflict resolution