Fixed merge error in configuration