fixing conflict in settings.py