Updated Bootstrap.php and App.php