What app are you using for note taking?
I need:
- Desktop + mobile
- Flat Markdown files
- Conflict-free synchronization
Obsidian really is the best option. You can sync with a private git repo but IMO paying for sync is money well spent, the product works perfectly.