Change "upsert" to "conflict"
Add other languages; fixes #424