merge settings into correct bucket