merged settings panel changes