merged package.json into the branch