merged master settings.py