Types of Conflict and Solutions