Merge conflict still unresolved

The document contains $conflicts entries from a semantic merge. Its records can be inspected, but it remains invalid and ara fmt will not silently erase those conflicts.

#Common causes

• A previous ara merge left conflicting edits for a human or agent to choose between.

#Fixes

• Use ara resolve <file> --pick <record>:<path>=ours or the corresponding theirs or base choice; the diagnostic supplies concrete ours and theirs commands.

• To choose one side for all conflicts, use ara resolve <file> --ours or --theirs, then run ara check <file>.

• Code: ARA1209

• Constant: UNRESOLVED_CONFLICT

• Reported by: ara-doc