Update on conflict

.> builtins.merge

a.x = 1
b.x = 2

Cause a conflict:

.> add
.merged> merge .a
.merged> merge .b

Ideally we could just define the canonical x that we want, and update to accept it, but we can't:

x = 1 + 2

Update fails on conflicted x:

.merged> update