Offline conflicts now show a diff

When you edit a note offline and another person edits the same note online, the merge result is now shown as a clear visual diff rather than silently picking a winner. You decide which changes to keep.

• Visual diff view on sync conflicts
• Accept all, reject all, or pick changes block by block
• Conflict history kept for 7 days