Lost package.json along the merge.