Moved the merge of Daneel's user config before the modules config