fix a bug in settings after merged