bug fix
Fixed merge error