Added line 4
Added line 5
Added line x
Revert "Added line x"

This reverts commit 42b4d6d304f577c967d871cca8d5b7b4fc5c7054.
Merge branch 'secondBranch'