Update settings.py
resolve merge conflict