Trying to cause the branch conflict in text2.txt