Sorted out conflicting config.php files
Merged config.php file