Correct merge casualty.

Change-Id: Ifd0ee22ee645ae887efee3a251a1f982909a7cbe