Update settings
merging changes
Updating management  commands