add local_settings.py
merge