fixing merge conflict
fixing merge conflict

eblin/feathers-authentication,m1ch3lcl/feathers-authentication,feathersjs/feathers-authentication,feathersjs/feathers-passport-jwt,feathersjs/feathers-passport-jwt,eblin/feathers-authentication,m1ch3lcl/feathers-authentication