Probabilistic Conflict Resolution