fixed an unusual merge issue