Fix merging issues.