Fix Merge Conflicts

When you're staring down merge conflicts and just need to get back to a clean build, this skill handles the resolution non-interactively. It detects conflicting files, resolves them with minimal edits that prioritize correctness, and validates everything compiles and passes tests before staging. The approach is pragmatic: preserve both sides when safe, otherwise pick what keeps things stable. It'll regenerate lockfiles properly instead of making you hand-edit them, and it won't leave conflict markers behind or try to sneak in refactors. The real value is in the workflow discipline: it forces validation before you finalize, which is exactly what you want when you're rushing to unblock a branch.