hey James, so you were right that it doesn't (yet) do conflict-resolution out of the box. if you want you could check out the other comment with a detailed response from a Holo team member: https://news.ycombinator.com/item?id=28700602