fixed merge conflict on js file