Make `yarn.lock` always copy upstream file when doing merge in code sync

package.json and yarn.lock is going to diverge from upstream, we need to always copy upstream yarn.lock when doing code sync, and then run yarn install based on merged package.json to generate diffs on yarn.lock and push it to our repo