Dealing with a yarn.lock conflict (https://github.com/yarnpkg/yarn/issues/1776#issuecomment-269539948)