Fix more merger funk

Change-Id: Ib4c1520fe6e1c2bcf6ef34392fe424c730326f9d