Update dependencies and resolve conflicts
Update dependencies and resolve conflicts

delitescere/yada,juxt/yada,thomas-shares/yada,thomas-shares/yada,mbutlerw/yada,mbutlerw/yada,mbutlerw/yada,juxt/yada,delitescere/yada,delitescere/yada,juxt/yada