fixing conflicts.