- Changed the configuration file load
Solved merge conflicts