Update Laravel
Fix merge conflict