Fixed a merge problem.