Fix merger

Change-Id: I30614c564d5b40662ede5ab7aa81ac71f5e0c5f5