resolve merge conflicts with main js file