Change handling of conflicts to keep extant local objects.