fix a merge mistake