Finish fixing merge problem.