[Bug 368858] On Line Update Creates Unresolvable Conflict.