fixing merge mistake