Fixed so it merge the user settings with the default settings