terms and conditions change in text
merge conflct at show model resolved