updated downloads_gen
remove client examples from conflict resolution index.md