Added contacts/ folder
Using 'theirs'
Merge conflict
Django models.py update