rename database.php to database.php.inc
rename database.php to database.php.inc
fixed merge conflict