resolve merge pb main.js