Fixing a broken file merge.