fixing conflicts