Changed validator to get files from temp directory
Fixed merge conflict in config.h