Changes made to fix merge issues
Fixing issues with Congfiguration.h