Fix merge problem.