Your question (the one I quoted) asks about different documents, right? In that case it’s alright. If you work on the same document, I think the later change would just override.
Yes, the latest Obsidian Sync comes with conflict merging. Synced vaults can’t be shared yet, so please use the same account on multiple devices.
I hope that helps!