yarn. Do not go
git checkout --theirs ... and
git reset ... and whatever else people might suggest. Just type
yarn and press enter. Yarn has an automatic conflict resolution built into it, it will detect that the yarn.lock file has conflicts, and use its internal algorithm to figure out what to do. This was a public service announcement.