Fixed merge issues
Moved to config.h