fix merging problems.