Adapted the settings.py file to the local development environment
Solved conflicts