Merge mistake