fixed merged Settings.js