Resolve teacup dependency conflict