Fix merging problems.