Fixing the merging problem.