Merge conflict on js