fixed merge issue in settings.py