Merge pull request #185 from xmtp/user/alexrisch-yarn-and-resolutions

Merge pull request #185 from xmtp/user/alexrisch-yarn-and-resolutions #104