Fixed merge problem.