Fixed merging problems.