Fix merge duplication

Change-Id: I4201d662347ed6bc28eb919a8d3d72c44dfcff92