Merge feature-branch with --no-ff

This allow us:

- to see the author of the merge
- to clearly see the work done in the feature-brancn in case it contains more than one commit