docs: add conflict resolution guidance to /review skill#476

carlos-alm merged 2 commits intomainoptave/codegraph:mainfrom

fix/review-skill-conflict-guidanceoptave/codegraph:fix/review-skill-conflict-guidanceCopy head branch name to clipboard