please resolve

AI assisted merge conflict resolution.

please resolve

Inspects every conflicted file, explains both sides of each conflict, and proposes a resolution. Nothing is edited until you approve it, and unrelated work is left alone. Runs the project’s tests afterward and reports the result.