fix a merge bug

Signed-off-by: Hake Huang <hakehuang@gmail.com>