ahyatt Fix incorrect SQL on conflict resolution when upgrading