[nim] resolving merge conflicts one file at a time. Resolving tasks.py
[nim] Resolving merge conflicts in urls.py
[nim] REsolving merge conflicts in 0004_migration_initial_data.json
[nim] Resolving master-sudan branch merge conflicts in models/litseners.py
[nim] Resolving master/sudan merge conflicts
[nim, chris] Resolcing merge between master and sudan
[nim, chris] Resolving merge conflict between uganda and south sudan