added CONFLICT status