fixed some bad merging on DefaultSettings.php