fixed compile bug caused by merge