Settings: fix merge