Update on conflict

.> builtins.merge

a.x = 1
b.x = 2

Cause a conflict:

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

Updating conflicted definitions works fine, and the associated patch contains two entries.

x = 3

.merged> update
.merged> view.patch