Delete unmerged row on update conflict

Since we merge rows on update, we should delete the extra umerged row
that the client calls update(URL_ID) on.

Test: new unit test and manual
Bug: 74504480
Change-Id: I8032fc0fc258f00881a37e6069058ae8157babe6
2 files changed