Add new line to test2
Merge remote-tracking branch 'origin/feature2'