recapturing models.py, urls.py
todo.org
conflict reso
conflict reso