fix conflicts
fix conflicts

leliviakid/TODO-Laravel-app,jason-chang/centstead,anggras/homestead,laravel/homestead,distr0yer/laravel,wardcraigj/jukebox,leliviakid/TODO-Laravel-app,hibriiiiidge/LaravelProject,laravel/homestead,hibriiiiidge/LaravelProject,juan2ramos/agroseller,leliviakid/TODO-Laravel-app,svpernova09/homestead,banaba0207/homestead,f3rland/homestead-mssql,juan2ramos/agroseller,justinmoh/mockingj,MageParts/homestead,wardcraigj/jukebox,gratif/homestead,paulgeneres/homestead,nickfan/homestead,crynobone/homestead,ananastech/fitnessapp,jordanramstad/homestead,NemoD503/habitat,ananastech/fitnessapp,crynobone/homestead,milkyway-multimedia/homestead,distr0yer/laravel,NemoD503/habitat,crynobone/homestead,nickfan/homestead,paulgeneres/homestead,milkyway-multimedia/homestead,wardcraigj/jukebox,juan2ramos/agroseller,hibriiiiidge/LaravelProject,distr0yer/laravel,hibriiiiidge/LaravelProject,nickfan/homestead,distr0yer/laravel,gratif/homestead,leliviakid/TODO-Laravel-app,anggras/homestead,davidrushton/homestead,ananastech/fitnessapp,johnpbloch/homestead,MageParts/homestead,ananastech/fitnessapp,shadow-droid/laravel-homestead,jordanramstad/homestead,justinmoh/mockingj,shadow-droid/laravel-homestead,banaba0207/homestead,svpernova09/homestead,wardcraigj/jukebox,davidrushton/homestead,banaba0207/homestead,gratif/homestead,ananastech/fitnessapp,banaba0207/homestead,svpernova09/homestead,johnpbloch/homestead,shadow-droid/laravel-homestead,f3rland/homestead-mssql,jason-chang/centstead,distr0yer/laravel,juan2ramos/agroseller,wardcraigj/jukebox,MageParts/homestead,justinmoh/mockingj,johnpbloch/homestead,laravel/homestead,davidrushton/homestead,NemoD503/habitat,f3rland/homestead-mssql,milkyway-multimedia/homestead,paulgeneres/homestead,jordanramstad/homestead,juan2ramos/agroseller,anggras/homestead