conflicts

For each conflicted file:

1. Understand the intent of both sides.
2. Produce a clean resolution — don't just pick one side blindly.
3. Briefly state what you chose and why for each file.

Always drive the current operation/rebase to conclusion.