Updated settings to use Appconf::merge()