Resolve merging problems.