[michael] fixed an merge error