Virtual conflict resolution