Resovled merge conflict in JS