merge conflict solved package.json