Fixing conflicts.