Settings: fix merge derp's