Remove older settings.py
Resolved merge conflict