fresh laravel project
fixed merge conflict in .gitignore