Fixing a merge problem.