Remove a missed git conflict mark, and fix the config form load to be able to load a config.xml file, if existent