SettingsActivity
Merge