Custom options should now be declared in functions.pjp rather than settings.php so the removed the custom settings array and the merge.