Fixed merging of conf and dconf. Fixed mapping.