Linear Conflict modified