Fixed some merging problems.