pretend having a merge conflict

to be removed after the test...