conflict resolution refs