creating separate deploy settings.py for master
change merge stategy for settings.py