Conflict Analysis And Resolution