fixed tiny merge mistake