corrected wrong order of merge

- [ ] test coverage
- [x] finish the code
- [x] gather feedback for my changes
- [ ] submit changes to the documentation


| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| Tests pass?   | no
| Fixed tickets | none
| Doc           | none