Update on conflict

Conflicted definitions prevent update from succeeding.

scratch/main> builtins.merge lib.builtins

x = 1
temp = 2

scratch/main> add
scratch/main> debug.alias.term.force temp x
scratch/main> delete.term temp

x = 3

scratch/main> update