missed a merge conflict on package.json