First sketch of flexible merge
+str #15079 Add flexible merge
Merge pull request #16052 from akka/wip-15079-flexi-merge-patriknw

+str #15079 Add flexible merge