Fixed another merge problem.