adding the new file in the branch
in here some more
Merge branch 'testing' into dev

with the extra file no ones sure what will happen
Update more_text
Update text.text
in here