builtin-merge: allow using a custom strategy