added Conflict status