resolve merge conflict main.js