fix halo merge derp

Change-Id: I73c2ae755618b434460117f3e17f74872426ca4f
Signed-off-by: zwliew <zhaoweiliew@gmail.com>