There are two types of conflict in organizations: task conflict, which involves disagreements over ideas and does not involve personal attacks; and relationship conflict, which threatens personal relationships. Conflict can be diagnosed based on factors like differing facts, perceptions, roles, environments, or personal issues. Common conflict resolution styles include competition, accommodation, avoidance, compromise, and collaboration, with collaboration aiming to satisfy all parties' concerns.