Edit package.json to resolve rebase conflicts