change test2.txt for test branch
change the test2.txt for test branch
change the test2.txt file for hotfix branch
merge in the change from both hotfix and test branch