update feathers branch