Changing txt2 in master branch
new file on master
adding text3 to new branch
Changed text3
New change
chaned test3
add new file
change to new
change to new
resolve