Conflict Analysis and Resolution