merged with laravel