adapted to new merge interface
1 file changed