fix one merge mistake