package.json resolved conflict