Resolve merging issues.