Changes to test.txt

Add some lines
Creating branch.txt with some context
Changes
Merge remote-tracking branch 'origin/feature2' into feature