Fixing a bad merge.