Fixing merging issues.