Fixed SettingConflicts +rSettings

Now needs rSettings