merge laravel files
update composer.json