[https://trello.com/c/66jdWKhn] Change mytext to test merge conflict