Testing adding a line in the same place
Merge branch 'test-branch'