When merging items, reuse conflicting labels as aliases

Bug: T67990
Change-Id: I78be7ca03a4a6fd0d86a5b476dd89ea81bac9fd3
Merge "When merging items, reuse conflicting labels as aliases"