Fixing a merge mistake