# Merge Conflicts

> Resolve merge conflicts in package.json, package-lock.json, SHA256.md following project conventions

- Skill: `forcedotcom/merge-conflicts` (Agent Skill)
- Install (CLI): `npx skillmds@latest add forcedotcom/merge-conflicts`
- Raw SKILL.md: https://api.skillmd.com/api/skills/forcedotcom/merge-conflicts/raw
- Safety review: pending
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Coding & Dev Tools
- Author: forcedotcom (https://skillmd.com/u/forcedotcom)
- Updated: 2026-09-17
- Page: https://skillmd.com/skills/forcedotcom/merge-conflicts

---


# Merge Conflict Resolution

## package.json

Use **higher value** for conflicts on the `version` property.

Use **higher version** for any conflicts in `dependencies` or `devDependencies`.

## package-lock.json

After all package.json conflicts are fixed, run `npm install` to fix the conflicts in the lockfile. **Never edit the lockfile directly.**

## Misc other files

Always take incoming changes:
- SHA256.md
- `packages/salesforcedx-vscode/CHANGELOG.md` and root `CHANGELOG.md` rarely conflict (different content: release notes vs. full history). If conflict: keep incoming, re-run merge workflow.