changes to make it build
Fixing config files
Merging