merge mistake