Fix some merging issues.