yarn lock conflicts

C++
git pull
yarn install
git add yarn.lock
git commit
Source

Also in C++: