Main configuration
Fix conflict