Fixing a merge conflict that snuck in.