Changes Settings
Merge conflict