[yarn] resolve merge conflict in lock file

[yarn] resolve merge conflict in lock file #151