I'm not sure how conflict resolution is done with Obsidian, but i have used both Dropbox and iCloud and with both i never had any sync issues in the last year that i've used Obsidian. Before Obsidian i used NvAlt which gave me sync issues all the time.