Fixed merging problem.