Release 1.3
Change handling of conflicts to keep extant local objects.