configuration
fixed merge