Fix merger

Change-Id: If1bcb65945c1459b05bbf0797bf393ed27fd0aa3