Make sure the user configs override the default configs, rather than vice versa.

The bug was having the defaults override the user configs during the merge.