Fixing conflit in settings.php