Allow different pronunciations without conflict in LiftMerger

* Write test (with Ken's help)
* Fix code

Change-Id: I2091981888767f4fe916e568d42706d68d6f52c5