fixing conflicts?