Test merge request conflicts 2

Counterpart of https://github.com/gitlabhq/testme/pull/4

Same thing: create a new branch `merge-request2`, and then delete this PR.