[UPDATE] Repair conflict with Database.php