tdd: changed merge() behavior
fixes #2
Merge branch 'feature/fix-merge-params' into develop