Don't save on merge

We automatically save when merging new things to settings. This is
actually not a great idea, usually we would probably want to merge, see
if settings are valid and then save.
Don't save if settings aren't valid