merge fix for configuration in