Conflict Types and Resolution Strategies