resolved conflict in settings.py