Removed conflict from settings.py