merge change to settings test