Recommit database.php to fix the conflict, Please do not commit database.php anymore.
Recommit database, to fix conflict made by aldrin.