Install laravel
Resolve conflicts by merge