conflict in yarn.lock code example Example: yarn lock conflicts git pull yarn install git add yarn.lock git commit