Resolve Laravel Conflict