deliberate merge conflict

To see how it can be resolved with Github flow.