fixing conflicts hopefully