Fixing merge mistake