fix merge dupes

Change-Id: Ic51660100e1a12dd32fa1dbe7aaf4515d3b23320