# Conflicts: # .gitignore # README.md # config/asgi.py # config/settings.py # config/urls.py # config/wsgi.py # manage.py # requirements.txt # templates/base.html # tests/conftest.py