Fix order of settings merges