Fixing some merging issues.