Update settings.py

Removed merge <<<<< HEAD - somehow missed this