changed text
fix all the merges