fix conflicts.
fix conflicts.


quentinyang/html,rajatsharma94/html,znsstudio/html,vluzrmos/collective-html,ankalus/html,wmather/html,ywjrg/html,vlakoff/html-1,vira-lytvynenko/html,barryvdh/html,laravie/html,grave2000/laravelcollective_html,jarektkaczyk/html,StefanPrintezis/html,cgrossde/html,EspadaV8/html,waynedmustt/html,sebdesign/html,LaravelCollective/html,bsampaio/collective-html,tofarias/html,djh101/html