changed example to reflect new merge signature
1 file changed