fixing conflicts again